diff --git a/src/common/gamecode/laws.c b/src/common/gamecode/laws.c
index 72d3c5123..fc59b2a62 100644
--- a/src/common/gamecode/laws.c
+++ b/src/common/gamecode/laws.c
@@ -2980,6 +2980,7 @@ renumber(void)
 					break;
 
 				case P_BUILDING:
+				case P_GEBAEUDE:
 					if(!u->building) {
 						cmistake(u,S->s,145,MSG_EVENT);
 						continue;
diff --git a/src/common/kernel/eressea.c b/src/common/kernel/eressea.c
index c2db2bbc9..1947f5f3e 100644
--- a/src/common/kernel/eressea.c
+++ b/src/common/kernel/eressea.c
@@ -1338,16 +1338,17 @@ getkeyword (const struct locale * lang)
 param_t
 findparam(const char *s, const struct locale * lang)
 {
-	struct lstr * lnames = get_lnames(lang);
-	const building_type * btype;
-
-	int i;
-	if (findtoken(&lnames->tokens[UT_PARAM], s, (void**)&i)==E_TOK_NOMATCH) {
-		btype = findbuildingtype(s, lang);
-		if (btype!=NULL) return (param_t) P_BUILDING;
-		return NOPARAM;
-	}
-	return (param_t)i;
+  struct lstr * lnames = get_lnames(lang);
+  const building_type * btype;
+  
+  int i;
+  if (findtoken(&lnames->tokens[UT_PARAM], s, (void**)&i)==E_TOK_NOMATCH) {
+	btype = findbuildingtype(s, lang);
+	if (btype!=NULL) return (param_t) P_GEBAEUDE;
+	return NOPARAM;
+  }
+  if (i==P_BUILDING) return P_GEBAEUDE;
+  return (param_t)i;
 }
 
 param_t