diff --git a/bin/git-imerge b/bin/git-imerge
new file mode 100755
index 0000000..1a6c84a
--- /dev/null
+++ b/bin/git-imerge
@@ -0,0 +1,8 @@
+#! /usr/bin/env python
+
+from gitimerge.gitimerge import main
+import sys
+
+main(sys.argv[1:])
+
+# vim: set expandtab ft=python:
diff --git a/gitimerge/__init__.py b/gitimerge/__init__.py
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/gitimerge/__init__.py
@@ -0,0 +1 @@
+
diff --git a/git-imerge b/gitimerge/gitimerge.py
similarity index 99%
rename from git-imerge
rename to gitimerge/gitimerge.py
index e08a2a4..4ad9936 100755
--- a/git-imerge
+++ b/gitimerge/gitimerge.py
@@ -1,5 +1,3 @@
-#! /usr/bin/env python
-
 # Copyright 2012-2013 Michael Haggerty <mhagger@alum.mit.edu>
 #
 # This file is part of git-imerge.
@@ -3312,7 +3310,6 @@ def main(args):
     else:
         parser.error('Unrecognized subcommand')
 
-
-main(sys.argv[1:])
-
+if __name__ == "__main__":
+    main(sys.argv[1:])
 # vim: set expandtab ft=python:
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..c086bb2
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,18 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+# vim:fenc=utf-8
+
+from distutils.core import setup
+
+setup(
+    name = 'gitimerge',
+    description = 'Incremental merge for git',
+    author='Michael Haggerty',
+    version='0.7.0',
+    author_email='mhagger@alum.mit.edu',
+    url='https://github.com/mhagger/git-imerge',
+    packages=['gitimerge'],
+    license='GPL',
+    scripts=['bin/git-imerge']
+)
+