diff --git a/ChangeLog.rst b/ChangeLog.rst
index e398faee..7f0cdefa 100644
--- a/ChangeLog.rst
+++ b/ChangeLog.rst
@@ -1,6 +1,10 @@
 Change Log
 ==========
 
+New in version 2.1.1
+--------------------
+* Fix ``setup.py`` dependency on six already being installed.
+
 New in version 2.1.0
 --------------------
 * Public classes and exceptions can now be imported from the top-level
diff --git a/pymemcache/__init__.py b/pymemcache/__init__.py
index d7684a28..6b9aa276 100644
--- a/pymemcache/__init__.py
+++ b/pymemcache/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.1.0'
+__version__ = '2.1.1'
 
 from pymemcache.client.base import Client  # noqa
 from pymemcache.client.base import PooledClient  # noqa
diff --git a/setup.cfg b/setup.cfg
index 09b7379c..ebab45f9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,3 @@
-[bumpversion]
-current_version = 2.0.0
-commit = False
-tag = True
-
 [bdist_wheel]
 universal = true
 
@@ -27,6 +22,3 @@ markers =
 show-source = True
 max-line-length = 80
 exclude = .tox/*,.venv/*,docs/*
-
-[bumpversion:file:pymemcache/__init__.py]
-
diff --git a/setup.py b/setup.py
index 7984cc91..fa8174de 100644
--- a/setup.py
+++ b/setup.py
@@ -1,20 +1,29 @@
 #!/usr/bin/env python
+
 import os
+import re
 
 from setuptools import setup, find_packages
-from pymemcache import __version__
 
 
-def read(fname):
-    return open(os.path.join(os.path.dirname(__file__), fname)).read()
+def read(path):
+    return open(os.path.join(os.path.dirname(__file__), path)).read()
+
+
+def read_version(path):
+    match = re.search(r"^__version__ = ['\"]([^'\"]*)['\"]", read(path), re.M)
+    if match:
+        return match.group(1)
+    raise RuntimeError("Unable to find __version__ in %s." % path)
 
 
 readme = read('README.rst')
 changelog = read('ChangeLog.rst')
+version = read_version('pymemcache/__init__.py')
 
 setup(
     name='pymemcache',
-    version=__version__,
+    version=version,
     author='Charles Gordon',
     author_email='charles@pinterest.com',
     packages=find_packages(),