diff --git a/MANIFEST.in b/MANIFEST.in
index 86ae0f60..9b3331b3 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,7 +1,6 @@
-recursive-include pyqtgraph *.py *.ui *.m README *.txt
-recursive-include tests *.py *.ui
+recursive-include pyqtgraph *.py *.ui *.m README.* *.txt
 recursive-include examples *.py *.ui *.gz *.cfg
-recursive-include doc *.rst *.py *.svg *.png *.jpg
+recursive-include doc *.rst *.py *.svg *.png
 recursive-include doc/build/html *
 recursive-include tools *
 include doc/Makefile doc/make.bat README.md LICENSE.txt CHANGELOG
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 604ea549..04acdd36 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -50,9 +50,9 @@ copyright = '2011, Luke Campagnola'
 # built documents.
 #
 # The short X.Y version.
-version = '0.9.9'
+version = '0.9.10'
 # The full version, including alpha/beta/rc tags.
-release = '0.9.9'
+release = '0.9.10'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/pyqtgraph/__init__.py b/pyqtgraph/__init__.py
index 0f5333f0..1c152d46 100644
--- a/pyqtgraph/__init__.py
+++ b/pyqtgraph/__init__.py
@@ -4,7 +4,7 @@ PyQtGraph - Scientific Graphics and GUI Library for Python
 www.pyqtgraph.org
 """
 
-__version__ = '0.9.9'
+__version__ = '0.9.10'
 
 ### import all the goodies and add some helper functions for easy CLI use
 
diff --git a/setup.py b/setup.py
index 4c1a6aca..7ca1be26 100644
--- a/setup.py
+++ b/setup.py
@@ -34,14 +34,17 @@ setupOpts = dict(
 )
 
 
-from distutils.core import setup
 import distutils.dir_util
+from distutils.command import build
 import os, sys, re
 try:
-    # just avoids warning about install_requires
     import setuptools
+    from setuptools import setup
+    from setuptools.command import install
 except ImportError:
-    pass
+    from distutils.core import setup
+    from distutils.command import install
+
 
 path = os.path.split(__file__)[0]
 sys.path.insert(0, os.path.join(path, 'tools'))
@@ -55,9 +58,8 @@ allPackages = (helpers.listAllPackages(pkgroot='pyqtgraph') +
 version, forcedVersion, gitVersion, initVersion = helpers.getVersionStrings(pkg='pyqtgraph')
 
 
-import distutils.command.build
 
-class Build(distutils.command.build.build):
+class Build(build.build):
     """
     * Clear build path before building
     * Set version string in __init__ after building
@@ -71,7 +73,7 @@ class Build(distutils.command.build.build):
         if os.path.isdir(buildPath):
             distutils.dir_util.remove_tree(buildPath)
     
-        ret = distutils.command.build.build.run(self)
+        ret = build.build.run(self)
         
         # If the version in __init__ is different from the automatically-generated
         # version string, then we will update __init__ in the build directory
@@ -94,9 +96,8 @@ class Build(distutils.command.build.build):
             sys.excepthook(*sys.exc_info())
         return ret
         
-import distutils.command.install
 
-class Install(distutils.command.install.install):
+class Install(install.install):
     """
     * Check for previously-installed version before installing
     """
@@ -108,7 +109,8 @@ class Install(distutils.command.install.install):
                             "installed at %s; remove this before installing." 
                             % (name, path))
         print("Installing to %s" % path)
-        return distutils.command.install.install.run(self)
+        return install.install.run(self)
+
         
 setup(
     version=version,
diff --git a/tools/setupHelpers.py b/tools/setupHelpers.py
index b308b226..ef711b84 100644
--- a/tools/setupHelpers.py
+++ b/tools/setupHelpers.py
@@ -360,12 +360,9 @@ def getGitVersion(tagPrefix):
         
     # Find last tag matching "tagPrefix.*"
     tagNames = check_output(['git', 'tag'], universal_newlines=True).strip().split('\n')
-    while True:
-        if len(tagNames) == 0:
-            raise Exception("Could not determine last tagged version.")
-        lastTagName = tagNames.pop()
-        if re.match(tagPrefix+r'\d+\.\d+.*', lastTagName):
-            break
+    tagNames = [x for x in tagNames if re.match(tagPrefix + r'\d+\.\d+\..*', x)]
+    tagNames.sort(key=lambda s: map(int, s[len(tagPrefix):].split('.')))
+    lastTagName = tagNames[-1]
     gitVersion = lastTagName.replace(tagPrefix, '')
     
     # is this commit an unchanged checkout of the last tagged version?