diff --git a/HISTORY.rst b/HISTORY.rst
new file mode 100644
index 0000000..e69de29
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..370ba3d
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include HISTORY.rst README.rst tabbed
\ No newline at end of file
diff --git a/README.mkd b/README.rst
similarity index 100%
rename from README.mkd
rename to README.rst
diff --git a/setup.py b/setup.py
index 4265cc3..b6193dd 100644
--- a/setup.py
+++ b/setup.py
@@ -1 +1,36 @@
 #!/usr/bin/env python
+
+import os
+import sys
+import tablib
+
+from distutils.core import setup
+
+
+def publish():
+    """Publish to PyPi"""
+    os.system("python setup.py sdist upload")
+
+if sys.argv[-1] == "publish":
+    publish()
+    sys.exit()
+
+setup(name='tablib',
+      version=tablib.__version__,
+      description='Python wrapper for Gist API',
+      long_description=open('README.rst').read() + '\n\n' +
+                       open('HISTORY.rst').read(),
+      author='Kenneth Reitz',
+      author_email='me@kennethreitz.com',
+      url='http://github.com/kennethreitz/tabbed',
+      packages=['tablib'],
+      license='MIT',
+      classifiers=(
+        "Development Status :: 4 - Beta",
+        "License :: OSI Approved :: MIT License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 2.5",
+        "Programming Language :: Python :: 2.6",
+        "Programming Language :: Python :: 2.7",
+        )
+      )
diff --git a/tablib/cli.py b/tablib/cli.py
index 77b354d..c23b427 100644
--- a/tablib/cli.py
+++ b/tablib/cli.py
@@ -8,7 +8,7 @@ import io
 import sys
 
 from helpers import *
-import tabbed.core
+import tablib.core
 
 from packages import opster