diff --git a/docs/changes.rst b/docs/changes.rst
index 95541797..dfc777f0 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -4,12 +4,34 @@ Changes
 
 This change log is used to track all major changes to Mopidy.
 
-
 v0.7.0 (in development)
 =======================
 
 **Important changes**
 
+- Nothing yet.
+
+**Changes**
+
+- The MPD command ``playlistinfo`` is now faster, thanks to John Bäckstrand.
+
+- Added the method
+  :meth:`mopidy.backends.base.CurrentPlaylistController.length()`,
+  :meth:`mopidy.backends.base.CurrentPlaylistController.index()`, and
+  :meth:`mopidy.backends.base.CurrentPlaylistController.slice()` to reduce the
+  need for copying the entire current playlist from one thread to another.
+  Thanks to John Bäckstrand for pinpointing the issue.
+
+
+v0.6.1 (2011-12-28)
+===================
+
+This is a maintenance release to make Mopidy 0.6 work with pyspotify >= 1.5,
+which Mopidy's develop branch have supported for a long time. This should also
+make the Debian packages work out of the box again.
+
+**Important changes**
+
 - pyspotify 1.5 or greater is required.
 
 **Changes**
@@ -18,14 +40,6 @@ v0.7.0 (in development)
   if you use playlist folders, you will no longer get lots of log messages
   about bad playlists.
 
-- The MPD command ``playlistinfo`` is now faster, thanks to John Bäckstrand.
-
-- Added the method
-  :meth:`mopidy.backends.base.CurrentPlaylistController.length()`,
-  :meth:`mopidy.backends.base.CurrentPlaylistController.index()`, and
-  :meth:`mopidy.backends.base.CurrentPlaylistController.slice()` to reduce the
-  need for copying the entire current playlist from one thread to another.
-  Thanks to John Bäckstrand for pinpointing the issue.
 
 
 v0.6.0 (2011-10-09)
diff --git a/tests/version_test.py b/tests/version_test.py
index bd9ba7b9..dbaed0a2 100644
--- a/tests/version_test.py
+++ b/tests/version_test.py
@@ -23,7 +23,8 @@ class VersionTest(unittest.TestCase):
         self.assert_(SV('0.4.0') < SV('0.4.1'))
         self.assert_(SV('0.4.1') < SV('0.5.0'))
         self.assert_(SV('0.5.0') < SV('0.6.0'))
-        self.assert_(SV('0.6.0') < SV(get_plain_version()))
+        self.assert_(SV('0.6.0') < SV('0.6.1'))
+        self.assert_(SV('0.6.1') < SV(get_plain_version()))
         self.assert_(SV(get_plain_version()) < SV('0.7.1'))
 
     def test_get_platform_contains_platform(self):