diff --git a/CHANGES b/CHANGES
index 7850281..695f39a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,31 @@ Pint Changelog
 ==============
 
 
-0.5.3 (unreleased)
-------------------
+0.6 (unreleased)
+----------------
 
-- Nothing changed yet.
+- Faster conversions through caching and other performance improvements
+  (Issue #193, thanks MatthieuDartiailh)
+- Fixed abbreviation of fluid_ounce.
+  (Issue #187, thanks hsoft)
+- Defined Angstrom symbol.
+  (Issue #181, thanks JonasOlson)
+- Removed fetching version from git repo as it triggers XCode installation on OSX.
+  (Issue #178, thanks deanishe)
+- Improved context documentation.
+  (Issue #176 and 179, thanks rsking84)
+- Added Chemistry context.
+  (Issue #179, thanks rsking84)
+- Optimized "get_dimensionality" and "get_base_name".
+  (Issue #166 and #167, thanks jbmohler)
+- Renamed ureg.parse_units parameter "to_delta" to "as_delta" to make clear
+  that no conversion happens. Accordingly, the parameter/property
+  "default_to_delta" of UnitRegistry was renamed to "default_as_delta".
+  (Issue #158, thanks dalit)
+- Fixed problem when adding two uncertainties.
+  (thanks dalito)
+- Full support for Offset units (e.g. temperature)
+  (Issue #88, #143, #147 and #161, thanks dalito)
 
 
 0.5.2 (2014-07-31)
diff --git a/CHANGES_DEV b/CHANGES_DEV
index a67cc22..76a9deb 100644
--- a/CHANGES_DEV
+++ b/CHANGES_DEV
@@ -1,15 +1,5 @@
 
-0.6 (unreleased)
+
+
+0.7 (unreleased)
 ----------------
-
-- Optimized "get_dimensionality" and "get_base_name".
-  (Issue #166 and #167, thanks jbmohler)
-- Renamed ureg.parse_units parameter "to_delta" to "as_delta" to make clear 
-  that no conversion happens. Accordingly, the parameter/property 
-  "default_to_delta" of UnitRegistry was renamed to "default_as_delta".
-  (Issue #158, thanks dalit)
-- Fixed problem when adding two uncertainties.
-  (thanks dalito)
-- Full support for Offset units (e.g. temperature)
-  (Issue #88, #143, #147 and #161, thanks dalito)
-