diff --git a/AUTHORS b/AUTHORS
index 20a9eaf1d2..090bbc426f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -16,6 +16,16 @@ Chuck Thier
 Contributors
 ------------
 Chmouel Boudjnah
+Anne Gentle
+Clay Gerrard
+David Goetz
+Soren Hansen
+Paul Jimenez
+Brian K. Jones
 Ed Leafe
-Conrad Weidenkeller
+Andrew Clay Shafer
 Monty Taylor
+Caleb Tennis
+Kapil Thangavelu
+Conrad Weidenkeller
+Cory Wright
diff --git a/doc/source/conf.py b/doc/source/conf.py
index b72990c17c..91596d6b4e 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -61,9 +61,10 @@ copyright = u'2010, OpenStack, LLC.'
 # built documents.
 #
 # The short X.Y version.
-version = '1.0'
+from swift import __version__
+version = __version__.rsplit('.', 1)[0]
 # The full version, including alpha/beta/rc tags.
-release = '1.0.2'
+release = __version__
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/setup.py b/setup.py
index 4cb3ac576e..66f4956cc6 100644
--- a/setup.py
+++ b/setup.py
@@ -19,6 +19,7 @@ from setuptools.command.sdist import sdist
 import os
 import subprocess
 
+from swift import __version__ as version
 
 class local_sdist(sdist):
     """Customized sdist hook - builds the ChangeLog file from VC first"""
@@ -36,7 +37,6 @@ class local_sdist(sdist):
 
 
 name = 'swift'
-version = '1.0.2'
 
 setup(
     name=name,
diff --git a/swift/__init__.py b/swift/__init__.py
index e69de29bb2..1a72d32e57 100644
--- a/swift/__init__.py
+++ b/swift/__init__.py
@@ -0,0 +1 @@
+__version__ = '1.1.0'