diff --git a/src/Jamrules b/src/Jamrules
index a1b678a36..d5599438d 100644
--- a/src/Jamrules
+++ b/src/Jamrules
@@ -29,7 +29,11 @@ CCFLAGS += -Wwrite-strings
 		   -Wno-char-subscripts
 		   ;
 
-XMLHDRS = /usr/include/libxml2 ;
+if $(HOST) = "hamunaptra" {
+  XMLHDRS = /homes2/info-f/enno/software/hamunaptra/include/libxml2 ;
+} else {
+  XMLHDRS = /usr/include/libxml2 ;
+}
 
 rule iconv
 {
@@ -40,7 +44,12 @@ rule iconv
 
 rule luabind
 {
-  LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib -llua50 -llualib50 ;
+  LINKLIBS on $(<) += -L$(LUABIND_ROOT)/lib ;
+  if $(HOST) = "hamunaptra" {
+    LINKLIBS on $(<) += -llua -llualib ;
+  } else { 
+    LINKLIBS on $(<) += -llua50 -llualib50 ;
+  }
   LINKLIBS on $(<) += -lm -lluabind ;
 }
 
diff --git a/src/eressea/lua/building.cpp b/src/eressea/lua/building.cpp
index 6d9d123e7..0c224db2d 100644
--- a/src/eressea/lua/building.cpp
+++ b/src/eressea/lua/building.cpp
@@ -11,6 +11,7 @@
 // lua includes
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
+#include <luabind/operator.hpp>
 #include <luabind/iterator_policy.hpp>
 
 // util includes
@@ -139,8 +140,8 @@ bind_building(lua_State * L)
     def("add_building", &add_building),
 
     class_<struct building>("building")
-    .def(tostring(self))
     .def(self == building())
+    .def(tostring(self))
     .property("name", &building_getname, &building_setname)
     .property("info", &building_getinfo, &building_setinfo)
     .property("units", &building_units, return_stl_iterator)
diff --git a/src/eressea/lua/faction.cpp b/src/eressea/lua/faction.cpp
index ac4c29824..2dadfffa4 100644
--- a/src/eressea/lua/faction.cpp
+++ b/src/eressea/lua/faction.cpp
@@ -18,6 +18,7 @@
 // lua includes
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
+#include <luabind/operator.hpp>
 #include <luabind/iterator_policy.hpp>
 
 #include <ostream>
diff --git a/src/eressea/lua/region.cpp b/src/eressea/lua/region.cpp
index 5c7833f5b..f66760016 100644
--- a/src/eressea/lua/region.cpp
+++ b/src/eressea/lua/region.cpp
@@ -12,6 +12,7 @@
 // lua includes
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
+#include <luabind/operator.hpp>
 #include <luabind/iterator_policy.hpp>
 
 #include <ostream>
diff --git a/src/eressea/lua/unit.cpp b/src/eressea/lua/unit.cpp
index 539405dd3..85b95241e 100644
--- a/src/eressea/lua/unit.cpp
+++ b/src/eressea/lua/unit.cpp
@@ -28,6 +28,7 @@
 // lua includes
 #include <lua.hpp>
 #include <luabind/luabind.hpp>
+#include <luabind/operator.hpp>
 #include <luabind/iterator_policy.hpp>
 
 #include <ostream>