@@ -49,8 +49,8 @@ if(ITKPythonPackage_SUPERBUILD)
   include(ExternalProject)
 
   set(ITK_REPOSITORY "https://github.com/InsightSoftwareConsortium/ITK.git")
-  # ITK nightly-master 2017-02-08
-  set(ITK_GIT_TAG "922f2d9")
+  # ITK nightly-master 2017-02-09
+  set(ITK_GIT_TAG "3fe1126")
 
   # Add an empty external project
   function(itk_ExternalProject_Add_Empty proj depends)
 
@@ -1 +1,25 @@
-VERSION = '4.11.0.dev139+20170208.g922f2d9'
+VERSION = '4.11.0.dev20170209+149.g3fe1126'
+
+def get_versions():
+    """Returns versions for the ITK Python package.
+
+    from itkVersion import get_versions
+
+    # Returns the ITK repository version
+    get_versions()['version']
+
+    # Returns the package version. Since GitHub Releases do not support the '+'
+    # character in file names, this does not contain the local version
+    # identifier in nightly builds, i.e.
+    #
+    #  '4.11.0.dev20170208'
+    #
+    # instead of
+    #
+    #  '4.11.0.dev20170208+139.g922f2d9'
+    get_versions()['package-version']
+    """
+    versions = {}
+    versions['version'] = VERSION
+    versions['package-version'] = VERSION.split('+')[0]
+    return versions
@@ -50,9 +50,9 @@
 pythonRevision = version
 if int(numberOfCommits) > 0:
     pythonRevision += '.dev'
-    pythonRevision += numberOfCommits
-    pythonRevision += '+'
     pythonRevision += commitDate
+    pythonRevision += '+'
+    pythonRevision += numberOfCommits
     pythonRevision += '.'
     pythonRevision += gHash
 
@@ -61,10 +61,16 @@
 if not os.path.exists(itkVersionPath):
     print('Expected file ' + itkVersionPath + ' not found!')
     sys.exit(1)
+with open(itkVersionPath, 'r') as fp:
+    lines = fp.readlines()
 with open(itkVersionPath, 'w') as fp:
-    fp.write("VERSION = '")
-    fp.write(pythonRevision)
-    fp.write("'\n")
+    for line in lines:
+        if line.startswith('VERSION = '):
+            fp.write("VERSION = '")
+            fp.write(pythonRevision)
+            fp.write("'\n")
+        else:
+            fp.write(line)
 
 
 with open('CMakeLists.txt', 'r') as fp:
 
@@ -3,11 +3,11 @@
 from skbuild import setup
 
 sys.path.append(path.dirname(path.dirname(path.abspath(__file__))))
-from itkVersion import VERSION
+from itkVersion import get_versions
 
 setup(
     name='itk',
-    version=VERSION,
+    version=get_versions()['package-version'],
     author='Insight Software Consortium',
     author_email='community@itk.org',
     packages=['itk'],