diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..9561fb1
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include README.rst
diff --git a/README.md b/README.md
index baeee8a..941fac8 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 # pinhook
 a pluggable irc bot framework in python
 
-# Currently in very early stages and may change wildly until final release
-
 ## Tutorial
 ### Installation
 ```
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
index bbe6d53..883e54e
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,103 @@
-#!/usr/bin/env python3
-from setuptools import setup
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
 
+# Note: To use the 'upload' functionality of this file, you must:
+#   $ pip install twine
+
+import io
+import os
+import sys
+from shutil import rmtree
+
+from setuptools import find_packages, setup, Command
+
+# Package meta-data.
+NAME = 'pinhook'
+DESCRIPTION = 'a pluggable irc bot framework in python'
+URL = 'https://github.com/archangelic/pinhook'
+EMAIL = 'mhancock@archangelic.space'
+AUTHOR = 'M. Hancock'
+
+# What packages are required for this module to be executed?
+REQUIRED = [
+    irc,
+]
+
+# The rest you shouldn't have to touch too much :)
+# ------------------------------------------------
+# Except, perhaps the License and Trove Classifiers!
+# If you do change the License, remember to change the Trove Classifier for that!
+
+here = os.path.abspath(os.path.dirname(__file__))
+
+# Import the README and use it as the long-description.
+# Note: this will only work if 'README.rst' is present in your MANIFEST.in file!
+with io.open(os.path.join(here, 'README.rst'), encoding='utf-8') as f:
+    long_description = '\n' + f.read()
+
+
+class UploadCommand(Command):
+    """Support setup.py upload."""
+
+    description = 'Build and publish the package.'
+    user_options = []
+
+    @staticmethod
+    def status(s):
+        """Prints things in bold."""
+        print('\033[1m{0}\033[0m'.format(s))
+
+    def initialize_options(self):
+        pass
+
+    def finalize_options(self):
+        pass
+
+    def run(self):
+        try:
+            self.status('Removing previous builds…')
+            rmtree(os.path.join(here, 'dist'))
+        except OSError:
+            pass
+
+        self.status('Building Source and Wheel (universal) distribution…')
+        os.system('{0} setup.py sdist bdist_wheel --universal'.format(sys.executable))
+
+        self.status('Uploading the package to PyPi via Twine…')
+        os.system('twine upload dist/*')
+
+        sys.exit()
+
+
+# Where the magic happens:
 setup(
-    name='pinhook',
-    version='0.2.0',
-    license="MIT",
-    description="A pluggable IRC bot framework in Python",
-    install_requires=[
-        'irc',
+    name=NAME,
+    version='1.0.0',
+    description=DESCRIPTION,
+    long_description=long_description,
+    author=AUTHOR,
+    author_email=EMAIL,
+    url=URL,
+    # If your package is a single module, use this instead of 'packages':
+    py_modules=['pinhook'],
+    install_requires=REQUIRED,
+    include_package_data=True,
+    license='MIT',
+    classifiers=[
+        # Trove classifiers
+        # Full list: https://pypi.python.org/pypi?%3Aaction=list_classifiers
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
-    packages=[
-        'pinhook',
-    ]
+    # $ setup.py publish support.
+    cmdclass={
+        'upload': UploadCommand,
+    },
 )