diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c
index ad43ca124..06bedc668 100644
--- a/src/common/kernel/battle.c
+++ b/src/common/kernel/battle.c
@@ -701,11 +701,11 @@ select_armor(troop t, boolean shield)
   const armor * a = t.fighter->armors;
   int geschuetzt = 0;
 
-  /* Drachen benutzen keine Rüstungen */
+  /* dragons do not use armor */
   if (!(u->race->battle_flags & BF_EQUIPMENT))
     return NULL;
 
-  /* ... und Werwölfe auch nicht */
+  /* ... neither do werewolves */
   if (fval(u, UFL_WERE)) {
     return NULL;
   }
diff --git a/src/common/kernel/build.c b/src/common/kernel/build.c
index 8b7f8c125..182b57296 100644
--- a/src/common/kernel/build.c
+++ b/src/common/kernel/build.c
@@ -935,10 +935,20 @@ build_building(unit * u, const building_type * btype, int want, order * ord)
     new_order = default_order(lang);
   } else if (n!=INT_MAX) {
     /* reduzierte restgröße */
-    new_order = create_order(K_MAKE, lang, "%d '%s' %i", n-built, btname, b->no);
+    const char * hasspace = strchr(btname, ' ');
+    if (hasspace) {
+      new_order = create_order(K_MAKE, lang, "%d \"%s\" %i", n-built, btname, b->no);
+    } else {
+      new_order = create_order(K_MAKE, lang, "%d %s %i", n-built, btname, b->no);
+    }
   } else if (btname) {
     /* Neues Haus, Befehl mit Gebäudename */
-    new_order = create_order(K_MAKE, lang, "'%s' %i", btname, b->no);
+    const char * hasspace = strchr(btname, ' ');
+    if (hasspace) {
+      new_order = create_order(K_MAKE, lang, "\"%s\" %i", btname, b->no);
+    } else {
+      new_order = create_order(K_MAKE, lang, "%s %i", btname, b->no);
+    }
   }
 
   if (new_order) {