diff --git a/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs b/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs
index a467edd4c..18fc37126 100644
--- a/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs
+++ b/Barotrauma/BarotraumaClient/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.1.1")]
-[assembly: AssemblyFileVersion("0.6.1.1")]
+[assembly: AssemblyVersion("0.6.1.2")]
+[assembly: AssemblyFileVersion("0.6.1.2")]
diff --git a/Barotrauma/BarotraumaServer/Properties/AssemblyInfo.cs b/Barotrauma/BarotraumaServer/Properties/AssemblyInfo.cs
index b3eda8fa6..5e8bf971a 100644
--- a/Barotrauma/BarotraumaServer/Properties/AssemblyInfo.cs
+++ b/Barotrauma/BarotraumaServer/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.1.1")]
-[assembly: AssemblyFileVersion("0.6.1.1")]
+[assembly: AssemblyVersion("0.6.1.2")]
+[assembly: AssemblyFileVersion("0.6.1.2")]
diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt
index a8e1981d0..ebd9912e3 100644
--- a/Barotrauma/BarotraumaShared/changelog.txt
+++ b/Barotrauma/BarotraumaShared/changelog.txt
@@ -1,3 +1,20 @@
+---------------------------------------------------------------------------------------------------------
+v0.6.1.2
+---------------------------------------------------------------------------------------------------------
+
+- Dedicated servers can use autorestart.
+- Fixed dedicated servers ignoring armor.
+- Fixed console messages not appearing in the crash reports if the game crashes during loading.
+- Attachable items (buttons, electrical components, etc) are automatically attached to walls when placed 
+in the submarine editor.
+- Fixed crashing if no matching character is found when using the SetClientCharacter console command.
+- Fixed wires disconnecting from a connection panel when a player moves any of the wires.
+- Tab doesn't autoselect the chatbox when the debug console is open.
+- Fixed missing kick/ban buttons in the crew menu.
+- Fixed a bug that caused ID mismatches in the hulls between docking ports. This caused, for example,
+mysterious client-side fires around docking ports and "unknown object header" errors.
+
+
 ---------------------------------------------------------------------------------------------------------
 v0.6.1.1
 ---------------------------------------------------------------------------------------------------------