diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs
index a603a3386..155d0f07e 100644
--- a/Subsurface/Properties/AssemblyInfo.cs
+++ b/Subsurface/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.0.0")]
-[assembly: AssemblyFileVersion("0.6.0.0")]
+[assembly: AssemblyVersion("0.6.0.1")]
+[assembly: AssemblyFileVersion("0.6.0.1")]
diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt
index e33541c12..3b74ad6bd 100644
--- a/Subsurface/changelog.txt
+++ b/Subsurface/changelog.txt
@@ -1,3 +1,20 @@
+---------------------------------------------------------------------------------------------------------
+v0.6.0.1
+---------------------------------------------------------------------------------------------------------
+
+- Readded spam filter.
+- Servers log the automatic temperature control setting of nuclear reactors.
+- If a client fails to start a round (due to a missing sub file or an error, for example), their character 
+is automatically killed. This prevents situations where a team can't win a combat mission due to a 
+disabled, invisible character in the opposing team.
+- Fixed clients occasionally displaying the "crew has been defeated" message immediately after a combat
+mission starts.
+- Fixed a bunch of bugs in the job assignment logic.
+- Fixed errors if attempting to send radio messages without a radio in the inventory.
+- Fixed "component doesn't have a GUIFrame component" errors when selecting an artifact holder.
+- Disabled unnecessary server-side message ID logging.
+- Option to enable additional network debug logging by enabling verbose logging in config.xml.
+
 ---------------------------------------------------------------------------------------------------------
 v0.6.0.0
 ---------------------------------------------------------------------------------------------------------
@@ -52,7 +69,6 @@ Misc:
 	- swimming animation fix: characters don't swim with their legs extended up over their shoulders 
 	after a sharp turn
 
-
 ---------------------------------------------------------------------------------------------------------
 v0.5.4.5
 ---------------------------------------------------------------------------------------------------------