diff --git a/Barotrauma/BarotraumaClient/Launch_Barotrauma b/Barotrauma/BarotraumaClient/Launch_Barotrauma
new file mode 100644
index 000000000..8792fad24
--- /dev/null
+++ b/Barotrauma/BarotraumaClient/Launch_Barotrauma
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec mono "./Barotrauma.exe" MONO_LOG_LEVEL=debug "$@"
diff --git a/Barotrauma/BarotraumaClient/LinuxClient.csproj b/Barotrauma/BarotraumaClient/LinuxClient.csproj
index 9f61fb02c..f0fa4331e 100644
--- a/Barotrauma/BarotraumaClient/LinuxClient.csproj
+++ b/Barotrauma/BarotraumaClient/LinuxClient.csproj
@@ -164,6 +164,9 @@
     <None Include="Content\Effects\solidcolor_opengl.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="Launch_Barotrauma">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="Shaders\Content_opengl.mgcb" />
     <None Include="Content\Effects\blurshader_opengl.xnb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs
index 595edeff3..aab0cdf65 100644
--- a/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs
+++ b/Barotrauma/BarotraumaClient/Source/GameSession/GameModes/MultiPlayerCampaign.cs
@@ -79,22 +79,7 @@ namespace Barotrauma
                 }
             };
 
-            if (GameMain.Client != null && interactor == Character.Controlled)
-            {
-                var msgBox = new GUIMessageBox("", TextManager.Get("CampaignEnterOutpostPrompt")
-                    .Replace("[locationname]", Submarine.MainSub.AtStartPosition ? Map.CurrentLocation.Name : Map.SelectedLocation.Name),
-                    new string[] { TextManager.Get("Yes"), TextManager.Get("No") })
-                {
-                    UserData = "watchmanprompt"
-                };
-                msgBox.Buttons[0].OnClicked = (btn, userdata) =>
-                {
-                    GameMain.Client.RequestRoundEnd();
-                    return true;
-                };
-                msgBox.Buttons[0].OnClicked += msgBox.Close;
-                msgBox.Buttons[1].OnClicked += msgBox.Close;            
-            }
+            return background;
         }
 
         public override void Update(float deltaTime)
diff --git a/Barotrauma/BarotraumaServer/Launch_BarotraumaServer b/Barotrauma/BarotraumaServer/Launch_BarotraumaServer
new file mode 100644
index 000000000..4c7906d0e
--- /dev/null
+++ b/Barotrauma/BarotraumaServer/Launch_BarotraumaServer
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec mono "./DedicatedServer.exe" "$@"
diff --git a/Barotrauma/BarotraumaServer/Server.csproj b/Barotrauma/BarotraumaServer/Server.csproj
index 34d9a0dc1..1d344c8fe 100644
--- a/Barotrauma/BarotraumaServer/Server.csproj
+++ b/Barotrauma/BarotraumaServer/Server.csproj
@@ -213,9 +213,13 @@
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <None Include="packages.config" />
+  </ItemGroup>  
+  <ItemGroup Condition="'$(DefineConstants)' == 'LINUX' ">
+    <None Include="Launch_BarotraumaServer">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="..\BarotraumaShared\SharedCode.projitems" Label="Shared" />
   <Import Project="..\BarotraumaShared\SharedContent.projitems" Label="Shared" />