diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index c1ff5655e3..a41f9392fe 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -301,28 +301,6 @@ AddFilesToHaikuImage system settings : <post-install>fresh_install ;
 AddDirectoryToHaikuImage home config non-packaged add-ons decorators ;
 #AddFilesToHaikuImage home config add-ons decorators : ;
 
-# create directories that will remain empty
-AddDirectoryToHaikuImage system cache tmp ;
-AddDirectoryToHaikuImage system non-packaged ;
-AddDirectoryToHaikuImage system var empty ;
-AddDirectoryToHaikuImage system var log ;
-AddDirectoryToHaikuImage home Desktop ;
-AddDirectoryToHaikuImage home mail ;
-AddDirectoryToHaikuImage home config packages ;
-AddDirectoryToHaikuImage home config non-packaged bin ;
-AddDirectoryToHaikuImage home config non-packaged data fonts ;
-AddDirectoryToHaikuImage home config non-packaged lib ;
-AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
-AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
-AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
-AddDirectoryToHaikuImage home config non-packaged add-ons input_server filters ;
-AddDirectoryToHaikuImage home config non-packaged add-ons input_server methods ;
-AddDirectoryToHaikuImage home config non-packaged add-ons media plugins ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Tracker ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Print ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Screen\ Savers ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Translators ;
-
 # printers
 AddDirectoryToHaikuImage home config settings printers Preview
 	: home-config-settings-printers-preview.rdef ;
diff --git a/build/jam/images/HaikuImageBootstrap b/build/jam/images/HaikuImageBootstrap
index 8bb57e98d3..2cde49320e 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/build/jam/images/HaikuImageBootstrap
@@ -240,26 +240,5 @@ SEARCH on <post-install>fresh_install
 	= [ FDirName $(HAIKU_TOP) data system settings ] ;
 AddFilesToHaikuImage system settings : <post-install>fresh_install ;
 
-# create directories that will remain empty
-AddDirectoryToHaikuImage system cache tmp ;
-AddDirectoryToHaikuImage system non-packaged ;
-AddDirectoryToHaikuImage system var empty ;
-AddDirectoryToHaikuImage system var log ;
-AddDirectoryToHaikuImage home Desktop ;
-AddDirectoryToHaikuImage home mail ;
-AddDirectoryToHaikuImage home config packages ;
-AddDirectoryToHaikuImage home config non-packaged bin ;
-AddDirectoryToHaikuImage home config non-packaged lib ;
-AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
-AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
-AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
-AddDirectoryToHaikuImage home config non-packaged add-ons input_server filters ;
-AddDirectoryToHaikuImage home config non-packaged add-ons input_server methods ;
-AddDirectoryToHaikuImage home config non-packaged add-ons media plugins ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Tracker ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Print ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Screen\ Savers ;
-AddDirectoryToHaikuImage home config non-packaged add-ons Translators ;
-
 
 include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImageCommon ] ;
diff --git a/build/jam/images/HaikuImageCommon b/build/jam/images/HaikuImageCommon
index 27e14a709e..3c62d35073 100644
--- a/build/jam/images/HaikuImageCommon
+++ b/build/jam/images/HaikuImageCommon
@@ -1,3 +1,29 @@
+# create directories that may remain empty
+AddDirectoryToHaikuImage system cache tmp ;
+AddDirectoryToHaikuImage system non-packaged ;
+AddDirectoryToHaikuImage system var empty ;
+AddDirectoryToHaikuImage system var log ;
+AddDirectoryToHaikuImage home Desktop ;
+AddDirectoryToHaikuImage home mail ;
+AddDirectoryToHaikuImage home config cache ;
+AddDirectoryToHaikuImage home config packages ;
+AddDirectoryToHaikuImage home config settings ;
+AddDirectoryToHaikuImage home config var ;
+AddDirectoryToHaikuImage home config non-packaged bin ;
+AddDirectoryToHaikuImage home config non-packaged data fonts ;
+AddDirectoryToHaikuImage home config non-packaged lib ;
+AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers bin ;
+AddDirectoryToHaikuImage home config non-packaged add-ons kernel drivers dev ;
+AddDirectoryToHaikuImage home config non-packaged add-ons input_server devices ;
+AddDirectoryToHaikuImage home config non-packaged add-ons input_server filters ;
+AddDirectoryToHaikuImage home config non-packaged add-ons input_server methods ;
+AddDirectoryToHaikuImage home config non-packaged add-ons media plugins ;
+AddDirectoryToHaikuImage home config non-packaged add-ons Tracker ;
+AddDirectoryToHaikuImage home config non-packaged add-ons Print ;
+AddDirectoryToHaikuImage home config non-packaged add-ons Screen\ Savers ;
+AddDirectoryToHaikuImage home config non-packaged add-ons Translators ;
+
+
 #pragma mark - Optional Packages