diff --git a/Barotrauma/Properties/AssemblyInfo.cs b/Barotrauma/Properties/AssemblyInfo.cs
index 155d0f07e..8f0f2c21e 100644
--- a/Barotrauma/Properties/AssemblyInfo.cs
+++ b/Barotrauma/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.1")]
-[assembly: AssemblyFileVersion("0.6.0.1")]
+[assembly: AssemblyVersion("0.6.0.2")]
+[assembly: AssemblyFileVersion("0.6.0.2")]
diff --git a/Barotrauma/changelog.txt b/Barotrauma/changelog.txt
index 3b74ad6bd..f7b0e5df7 100644
--- a/Barotrauma/changelog.txt
+++ b/Barotrauma/changelog.txt
@@ -1,3 +1,18 @@
+---------------------------------------------------------------------------------------------------------
+v0.6.0.2
+---------------------------------------------------------------------------------------------------------
+
+- Fixed "maximum packet size exceeded" errors when clients join servers.
+- Fixed a bug that caused non-interactable checkboxes to always appear unchecked.
+- Skill level syncing fix: the syncing isn't dependent on the order of the characters skills anymore.
+- IP addresses are included in all login error messages and the errors are also logged to the debug console.
+- Servers end rounds if all players are either dead or unconscious when autorestart is on (instead of 
+waiting for all players to die)
+- Fixed nuclear shells and depth charges exploding immediately when launched.
+- Fixed a bug that prevented any broken items from being repaired in the single player.
+- Fixed items disappearing from inside copypasted items (e.g. cabinets).
+- Added character teleporting console command.
+
 ---------------------------------------------------------------------------------------------------------
 v0.6.0.1
 ---------------------------------------------------------------------------------------------------------