diff --git a/CHANGELOG b/CHANGELOG
index 430f4f2..682f5fc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,21 @@
 =======================
-mumble-django changelog
+Mumble-Django changelog
 =======================
 
+Version 0.6, 02. May 2009:
+------------------------------
+* Re-Licensed the complete project under the GPL v2+, added License tags
+  to code files.
+* Added "default channel", "player name", "channel name", "IP obfuscation"
+  settings to Mumble model, therefore now supporting every one of Murmur's
+  config options.
+* IMPORTANT: If updating from a version <= 0.5, please run:
+    ./update-v0.5-v0.6.sh
+  in the pyweb directory. That way, you will update the database without
+  losing any data. If you are newly installing Mumble-Django, this does not
+  apply.
+* Various minor bug fixes.
+
 Version 0.5, 18 April 2009:
 ------------------------------
 * Added redirect for / into urls.py, as this is easier than configuring
diff --git a/LICENSE b/LICENSE
index 62606e0..b74d1ee 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright © 2007-2008, Michael Ziegler
+Copyright © 2009, Michael Ziegler
 All rights reserved.
 
 This package is free software; you can redistribute it and/or modify