diff --git a/src/Jamfile b/src/Jamfile
index c6ea39802..4f3285f28 100644
--- a/src/Jamfile
+++ b/src/Jamfile
@@ -1,6 +1,7 @@
 SubDir TOP ;
 
-SubInclude TOP common ;
+SubInclude TOP src ;
+SubInclude TOP eressea ;
 
 if $(BUILDTYPE) = REGULAR {
 SubInclude TOP common ;
diff --git a/src/eressea/Jamfile b/src/eressea/Jamfile
index 17d81c093..c66702469 100644
--- a/src/eressea/Jamfile
+++ b/src/eressea/Jamfile
@@ -1,17 +1,17 @@
 SubDir TOP eressea ;
 
 TargetDirectory ;
-SubDirHdrs $(SUBDIR)/../common/gamecode ;
-SubDirHdrs $(SUBDIR)/../common/kernel ;
-SubDirHdrs $(SUBDIR)/../common/util ;
-SubDirHdrs $(SUBDIR)/../common ;
+SubDirHdrs $(SUBDIR)/../src/gamecode ;
+SubDirHdrs $(SUBDIR)/../src/kernel ;
+SubDirHdrs $(SUBDIR)/../src/util ;
+SubDirHdrs $(SUBDIR)/../src ;
 SubDirHdrs $(SUBDIR)/../external ;
 SubDirHdrs $(SUBDIR)/.. ;
 
 UsingLua ;
 UsingLuabind ;
 
-SEARCH_SOURCE += [ FDirName $(TOP) common iniparser ] ;
+SEARCH_SOURCE += [ FDirName $(TOP) src iniparser ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) curses ] ;
 if $(BINDINGS) = LUABIND {
    SEARCH_SOURCE += [ FDirName $(SUBDIR) lua ] ;
@@ -72,7 +72,7 @@ if $(BINDINGS) = TOLUA {
 liblua $(LUASERVER) ;
 
 LUASERVER_SOURCES =
- <common!iniparser>iniparser.c
+ <src!iniparser>iniparser.c
  <curses>listbox.c
  server.c
  console.c