diff --git a/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs b/Barotrauma/BarotraumaClient/Properties/AssemblyInfo.cs
index 5acf0fbad..ee0f1eff0 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.8.1.11")]
-[assembly: AssemblyFileVersion("0.8.1.11")]
+[assembly: AssemblyVersion("0.8.1.12")]
+[assembly: AssemblyFileVersion("0.8.1.12")]
diff --git a/Barotrauma/BarotraumaServer/Properties/AssemblyInfo.cs b/Barotrauma/BarotraumaServer/Properties/AssemblyInfo.cs
index 09ad2201a..145e7eaa6 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.8.1.11")]
-[assembly: AssemblyFileVersion("0.8.1.11")]
+[assembly: AssemblyVersion("0.8.1.12")]
+[assembly: AssemblyFileVersion("0.8.1.12")]
diff --git a/Barotrauma/BarotraumaShared/changelog.txt b/Barotrauma/BarotraumaShared/changelog.txt
index 1af885e24..18dc1244e 100644
--- a/Barotrauma/BarotraumaShared/changelog.txt
+++ b/Barotrauma/BarotraumaShared/changelog.txt
@@ -1,3 +1,24 @@
+---------------------------------------------------------------------------------------------------------
+v0.8.1.12
+---------------------------------------------------------------------------------------------------------
+
+- Fixed connectionpanel syncing (wires dropping client-side during rewiring).
+- Characters stay alive for 30 seconds after a client disconnects, and if the client rejoins during that 
+time they regain control of the character. 
+- Changing the sprite color of an item also affects the color when the item is being worn.
+- Cloned items keep the value of the "required items" field of the original item.
+- Fixed crashes caused by gaps that are not connected to anything.
+- Removed the unused and non-functional monitor item.
+- Made medical and toxic cabinets waterproof (= potassium and other water-sensitive items inside them 
+are not affected by water).
+- Fixed docking ports causing flooding in some custom subs.
+- Fixed medical items with an immediate effect (such as calyxanide) not working when a player uses them
+on themselves in multiplayer.
+- Made calyxanide more effective and usable without a medical syringe.
+- Fixed engines trying to apply infinite force to the submarine if MinVoltage is set to zero.
+- Fixed levels resetting their mission to the previous one if the game is exited after completing a mission
+without selecting the level first.
+
 ---------------------------------------------------------------------------------------------------------
 v0.8.1.11
 ---------------------------------------------------------------------------------------------------------
diff --git a/Barotrauma/BarotraumaShared/serversettings.xml b/Barotrauma/BarotraumaShared/serversettings.xml
index c42cf2a7b..1823f3dcf 100644
--- a/Barotrauma/BarotraumaShared/serversettings.xml
+++ b/Barotrauma/BarotraumaShared/serversettings.xml
@@ -24,6 +24,7 @@
   traitoruseratio="True"
   traitorratio="0.2"
   karmaenabled="False"
+  KillDisconnectedTime="30"
   SubSelection="Manual"
   ModeSelection="Manual"
   GameMode="SandBox"