diff --git a/CHANGES.md b/CHANGES.md
index b839c8b..5b53139 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-0.5 (unreleased)
+0.6 (2015-07-20)
 ----------------
 
 - Fix a bug that caused ticks and labels to be incorrect if a WCS object was
diff --git a/setup.py b/setup.py
index 9e3eac7..4a05256 100755
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
 builtins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME
 
 # VERSION should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
-VERSION = '0.5.dev'
+VERSION = '0.6'
 
 # Indicates if this version is a release version
 RELEASE = 'dev' not in VERSION