diff --git a/CHANGES b/CHANGES
index 0cb765282c..ad9813dfa5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,3 @@
-0.3.7 (unreleased)
-------------------
-
-- No changes yet
-
-
 0.3.6 (2017-07-03)
 ------------------
 
diff --git a/setup.py b/setup.py
index 7136829117..6e85e91c11 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
 builtins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME
 
 # VERSION should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
-VERSION = '0.3.7.dev'
+VERSION = '0.3.6.post2'
 
 # Indicates if this version is a release version
 RELEASE = 'dev' not in VERSION