diff --git a/docs/conf.py b/docs/conf.py
index d98aab7bff1e2844c48d2051128eb1c7493f9391..add73c24feb281b40d6719dec34e3a9255789f75 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -47,7 +47,22 @@ copyright = '2009, The Open Planning Project'
 # built documents.
 #
 # The short X.Y version.
-version = '0.6'
+import re, os
+version_re = re.compile(
+    r'version = "(.*?)"')
+fp = open(os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
+                       'setup.py'))
+version = None
+for line in fp:
+    match = version_re.search(line)
+    if match:
+        release = match.group(1)
+        break
+else:
+    raise Exception("Cannot find version in setup.py")
+fp.close()
+del re, os, line, fp, version_re
+version = '.'.join(release.split('.')[:2])
 
 # The full version, including alpha/beta/rc tags.
 release = '0.6'
diff --git a/setup.py b/setup.py
index b225231b74d0a3369cebcd39652553081d43c696..7df7bd830d4d49cbecf3ccd2e890e04de6739830 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ else:
 import os
 
 
-version = '0.6'
+version = "0.6.post1"
 
 doc_dir = os.path.join(os.path.dirname(__file__), 'docs')
 index_filename = os.path.join(doc_dir, 'index.txt')