diff --git a/setup.py b/setup.py
index 70f3cbc041..353bd7fecb 100644
--- a/setup.py
+++ b/setup.py
@@ -66,11 +66,9 @@ if len(sys.argv) > 1 and sys.argv[1] == 'bdist_wininst':
         file_info[0] = '\\PURELIB\\%s' % file_info[0]
 
 # Dynamically calculate the version based on django.VERSION.
-version_tuple = __import__('django').VERSION
-if version_tuple[2] is not None:
-    version = "%d.%d_%s" % version_tuple
-else:
-    version = "%d.%d" % version_tuple[:2]
+version_tuple = __import__('django').get_version()
+if u'SVN' in version:
+    version = ' '.join(version.split(' ')[:-1])
 
 setup(
     name = "Django",