diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs
index 366bfd33b..d7267c35f 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.5.0.1")]
-[assembly: AssemblyFileVersion("0.5.0.1")]
+[assembly: AssemblyVersion("0.5.0.2")]
+[assembly: AssemblyFileVersion("0.5.0.2")]
diff --git a/Subsurface/changelog.txt b/Subsurface/changelog.txt
index 9748b1b8f..731614411 100644
--- a/Subsurface/changelog.txt
+++ b/Subsurface/changelog.txt
@@ -1,3 +1,14 @@
+---------------------------------------------------------------------------------------------------------
+v0.5.0.2
+---------------------------------------------------------------------------------------------------------
+
+- more server-side sanity checks to prevent (desynced or hacking) players from doing things their 
+characters shouldn't be able to do
+- fixed collision issues at docking ports (such as shooting up in the air when trying to drop down into
+a docked shuttle while shuttle hatch is closed)
+- fixed crashing when commanding a crew member to use a railgun in the single player mode
+- fixed chatbox staying disabled after being stunned (and reappearing when being stunned again)
+
 ---------------------------------------------------------------------------------------------------------
 v0.5.0.1
 ---------------------------------------------------------------------------------------------------------