diff --git a/packaging/freebsd/openra b/packaging/freebsd/openra
index 1763a49d23..e6cd99bd8e 100755
--- a/packaging/freebsd/openra
+++ b/packaging/freebsd/openra
@@ -12,7 +12,7 @@
 #    (default: /usr/home/${openra_user})
 # openra_path="<path to OpenRA.Game.exe>"
 #    (default: ${openra_chdir}/OpenRA/OpenRA.Game.exe)
-# openra_ServerName="<ServerName>" (no spaces allowed!)
+# openra_ServerName="<ServerName>" (default: "Dedicated Server")
 # openra_Mod="<Mod>" (default: ra)
 # openra_ListenPort="<number>" (default: 1234)
 # openra_ExternalPort="<number>" (default: 1234)
@@ -40,7 +40,7 @@ status_cmd="${name}_status"
 : ${openra_chdir="/usr/home/${openra_user}"}
 : ${openra_path="${openra_chdir}/OpenRA/OpenRA.Game.exe"}
 
-: ${openra_ServerName="Dedicated_Server"}
+: ${openra_ServerName="Dedicated Server"}
 : ${openra_Mod="ra"}
 : ${openra_ListenPort="1234"}
 : ${openra_ExternalPort="1234"}
@@ -52,7 +52,7 @@ openra_DedicatedLoop="True"
 : ${openra_runflags="Game.Mod=${openra_Mod} \
                    Server.Dedicated=${openra_Dedicated} \
                    Server.DedicatedLoop=${openra_DedicatedLoop} \
-                   Server.Name=${openra_ServerName} \
+                   Server.Name=\"${openra_ServerName}\" \
                    Server.ListenPort=${openra_ListenPort} \
                    Server.ExternalPort=${openra_ExternalPort} \
                    Server.AdvertiseOnline=${openra_AdvertiseOnline}\