diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..b3f8b08
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include comictagger *
diff --git a/Makefile b/Makefile
index b1cb88f..ccdac69 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,8 @@ all: clean
 
 clean:
 	rm -f *~ *.pyc *.pyo
+	cd comictagger; rm -f *~ *.pyc *.pyo
+	sudo rm -rf MANIFEST dist scripts
 	rm -f logdict*.log
 	make -C mac clean
 	make -C windows clean
@@ -20,7 +22,10 @@ zip:
 	
 	@echo When satisfied with release, do this:
 	@echo make svn_tag
-	
+
+pkg:
+	python setup.py sdist	
+
 svn_tag:
 	svn copy https://comictagger.googlecode.com/svn/trunk \
       https://comictagger.googlecode.com/svn/tags/$(VERSION_STR) -m "Release $(VERSION_STR)"
diff --git a/comictagger.py b/comictagger.py
index 4ea421a..078f515 100755
--- a/comictagger.py
+++ b/comictagger.py
@@ -1,4 +1,4 @@
 #!/usr/bin/python
-import comictagger.main
+from comictagger.main import ctmain
 
-comictagger.main.main()			
+ctmain()			
diff --git a/comictagger/main.py b/comictagger/main.py
index c3ab879..5d0c954 100755
--- a/comictagger/main.py
+++ b/comictagger/main.py
@@ -39,7 +39,7 @@ except ImportError as e:
 	qt_available = False
 #---------------------------------------
 
-def main():
+def ctmain():
 	# try to make stdout encodings happy for unicode
 	if platform.system() == "Darwin":
 		preferred_encoding = "utf-8"
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..1faf978
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+import distutils.command.install_scripts
+import os
+import shutil
+
+# Things are weird if the script has a py.  Will this break things for windows???
+if not os.path.exists('scripts/comictagger'):
+    if not os.path.exists('scripts'):
+        os.makedirs('scripts')
+    shutil.copyfile('comictagger.py', 'scripts/comictagger')
+
+
+setup(name = "comictagger",
+      version = "1.1.1",
+      description = "A cross-platorm GUI/CLI app for writing metadata to comic archives",
+      author = "Anthony Beville",
+      author_email = "comictagger@gmail.com",
+      url = "http://code.google.com/p/comictagger/",
+      packages =  [ "comictagger", "comictagger/UnRAR2" ] ,
+      package_data = {
+        'comictagger': ['ui/*.ui', 'graphics/*'] ,
+      },
+      scripts = ["scripts/comictagger"],
+      long_description = """
+ComicTagger is a multi-platform app for writing metadata to comic archives, written in Python and PyQt.
+
+Features:
+
+* Runs on Mac OSX, Microsoft Windows, and Linux systems
+* Communicates with an online database (Comic Vine) for acquiring metadata
+* Uses image processing to automatically match a given archive with the correct issue data
+* Batch processing in the GUI for tagging hundreds or more comics at a time
+* Reads and writes multiple tagging schemes ( ComicBookLover? and ComicRack?, with more planned).
+* Reads and writes RAR, Zip, and folder archives (external tools needed for writing RAR)
+* Command line interface (CLI) on all platforms (including Windows), which supports batch operations, and which can be used in native scripts for complex operations. 
+"""          
+      )