diff --git a/docs/_static/thread_communication.txt b/docs/_static/thread_communication.txt
deleted file mode 100644
index 4119004e..00000000
--- a/docs/_static/thread_communication.txt
+++ /dev/null
@@ -1,37 +0,0 @@
-Script for use with www.websequencediagrams.com
-===============================================
-
-Main -> Core: create
-activate Core
-note over Core: create NadMixer
-Core -> NadTalker: create
-activate NadTalker
-note over NadTalker: calibrate device
-note over Core: create DespotifyBackend
-Core -> despotify: connect to Spotify
-activate despotify
-note over Core: create MpdFrontend
-Main -> Server: create
-activate Server
-note over Server: open port
-Client -> Server: connect
-note over Server: open session
-Client -> Server: play 1
-Server -> Core: play 1
-Core -> despotify: play first track
-Client -> Server: setvol 50
-Server -> Core: setvol 50
-Core -> NadTalker: volume = 50
-Client -> Server: status
-Server -> Core: status
-Core -> NadTalker: volume?
-NadTalker -> Core: volume = 50
-Core -> Server: status response
-Server -> Client: status response
-despotify -> Core: end of track callback
-Core -> despotify: play second track
-Client -> Server: stop
-Server -> Core: stop
-Core -> despotify: stop
-Client -> Server: disconnect
-note over Server: close session
diff --git a/docs/changes.rst b/docs/changes.rst
index c93e0ee8..4125b788 100644
--- a/docs/changes.rst
+++ b/docs/changes.rst
@@ -5,12 +5,20 @@ Changes
 This change log is used to track all major changes to Mopidy.
 
 
-v0.5.0 (in development)
+v0.6.0 (in development)
 =======================
 
+**Changes**
+
+- None yet
+
+
+v0.5.0 (2011-06-15)
+===================
+
 Since last time we've added support for audio streaming to SHOUTcast servers
 and fixed the longstanding playlist loading issue in the Spotify backend. As
-always the release has a bunch of bug fixes.
+always the release has a bunch of bug fixes and minor improvements.
 
 Please note that 0.5.0 requires some updated dependencies, as listed under
 *Important changes* below.
@@ -74,6 +82,9 @@ Please note that 0.5.0 requires some updated dependencies, as listed under
   - Added :option:`--interactive` for reading missing local settings from
     ``stdin``. (Fixes: :issue:`96`)
 
+  - Improve shutdown procedure at CTRL+C. Add signal handler for ``SIGTERM``,
+    which initiates the same shutdown procedure as CTRL+C does.
+
 - Tag cache generator:
 
   - Made it possible to abort :command:`mopidy-scan` with CTRL+C.
diff --git a/mopidy/__init__.py b/mopidy/__init__.py
index 79a0aa29..7b25c525 100644
--- a/mopidy/__init__.py
+++ b/mopidy/__init__.py
@@ -5,7 +5,7 @@ if not (2, 6) <= sys.version_info < (3,):
 
 from subprocess import PIPE, Popen
 
-VERSION = (0, 5, 0)
+VERSION = (0, 6, 0)
 
 def get_version():
     try:
diff --git a/mopidy/utils/settings.py b/mopidy/utils/settings.py
index 500477e2..cab94089 100644
--- a/mopidy/utils/settings.py
+++ b/mopidy/utils/settings.py
@@ -73,7 +73,7 @@ class SettingsProxy(object):
             raise SettingsError(u'Settings validation failed.')
 
     def _read_missing_settings_from_stdin(self, current, runtime):
-        for setting, value in current.iteritems():
+        for setting, value in sorted(current.iteritems()):
             if isinstance(value, basestring) and len(value) == 0:
                 runtime[setting] = self._read_from_stdin(setting + u': ')
 
diff --git a/tests/version_test.py b/tests/version_test.py
index 7bfb540e..9b53c63f 100644
--- a/tests/version_test.py
+++ b/tests/version_test.py
@@ -19,8 +19,9 @@ class VersionTest(unittest.TestCase):
         self.assert_(SV('0.3.0') < SV('0.3.1'))
         self.assert_(SV('0.3.1') < SV('0.4.0'))
         self.assert_(SV('0.4.0') < SV('0.4.1'))
-        self.assert_(SV('0.4.1') < SV(get_plain_version()))
-        self.assert_(SV(get_plain_version()) < SV('0.5.1'))
+        self.assert_(SV('0.4.1') < SV('0.5.0'))
+        self.assert_(SV('0.5.0') < SV(get_plain_version()))
+        self.assert_(SV(get_plain_version()) < SV('0.6.1'))
 
     def test_get_platform_contains_platform(self):
         self.assert_(platform.platform() in get_platform())
diff --git a/tox.ini b/tox.ini
index 8b91c6b7..48676e46 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist = py26,py27,docs
 [testenv]
 deps = nose
 commands = nosetests []
+sitepackages = True
 
 [testenv:docs]
 basepython = python