diff --git a/.gitignore b/.gitignore
index 9980377f..34ccd387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@ html/*
 
 # Compiled Documentation
 site/
+README.rst
 
 env/
 venv/
diff --git a/scripts/release.sh b/scripts/release.sh
new file mode 100755
index 00000000..817f74d6
--- /dev/null
+++ b/scripts/release.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+#
+# Create the official release
+#
+
+if [ -z "$(command -v pandoc 2> /dev/null)" ]; then
+    >&2 echo "$0 requires http://pandoc.org/"
+    >&2 echo "Please install it and make sure it is available on your \$PATH."
+    exit 2
+fi
+
+VERSION=$1
+REPO=docker/docker-py
+GITHUB_REPO=git@github.com:$REPO
+
+if [ -z $VERSION ]; then
+    echo "Usage: $0 VERSION [upload]"
+    exit 1
+fi
+
+echo "##> Tagging the release as $VERSION"
+git tag $VERSION || exit 1
+if  [[ $2 == 'upload' ]]; then
+    echo "##> Pushing tag to github"
+    git push $GITHUB_REPO $VERSION || exit 1
+fi
+
+
+pandoc -f markdown -t rst README.md -o README.rst || exit 1
+python setup.py sdist bdist_wheel || exit 1
+if [[ $2 == 'upload' ]]; then
+    echo "##> Uploading sdist to pypi"
+    python setup.py upload
+fi
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 00000000..ccc93cfc
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[bdist_wheel]
+
+universal = 1