diff --git a/Jamfile b/Jamfile
index dcfbf5fcca..3ce3a69001 100644
--- a/Jamfile
+++ b/Jamfile
@@ -42,13 +42,13 @@ SubDir HAIKU_TOP ;
 UserBuildConfigRulePostBuildTargets	;
 
 # specify the Haiku image and network boot archive contents
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) NetBootArchive ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) FloppyBootImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) CDBootPPCImage ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) HaikuCD ] ;
-include [ FDirName $(HAIKU_BUILD_RULES_DIR) AnybootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images NetBootArchive ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images FloppyBootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images CDBootPPCImage ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images HaikuCD ] ;
+include [ FDirName $(HAIKU_BUILD_RULES_DIR) images AnybootImage ] ;
 
 # Check whether all requested optional packages do actually exist.
 local package ;
diff --git a/build/jam/AnybootImage b/build/jam/images/AnybootImage
similarity index 100%
rename from build/jam/AnybootImage
rename to build/jam/images/AnybootImage
diff --git a/build/jam/CDBootImage b/build/jam/images/CDBootImage
similarity index 100%
rename from build/jam/CDBootImage
rename to build/jam/images/CDBootImage
diff --git a/build/jam/CDBootPPCImage b/build/jam/images/CDBootPPCImage
similarity index 100%
rename from build/jam/CDBootPPCImage
rename to build/jam/images/CDBootPPCImage
diff --git a/build/jam/FloppyBootImage b/build/jam/images/FloppyBootImage
similarity index 100%
rename from build/jam/FloppyBootImage
rename to build/jam/images/FloppyBootImage
diff --git a/build/jam/Haiku64Image b/build/jam/images/Haiku64Image
similarity index 100%
rename from build/jam/Haiku64Image
rename to build/jam/images/Haiku64Image
diff --git a/build/jam/HaikuCD b/build/jam/images/HaikuCD
similarity index 100%
rename from build/jam/HaikuCD
rename to build/jam/images/HaikuCD
diff --git a/build/jam/HaikuImage b/build/jam/images/HaikuImage
similarity index 100%
rename from build/jam/HaikuImage
rename to build/jam/images/HaikuImage
diff --git a/build/jam/NetBootArchive b/build/jam/images/NetBootArchive
similarity index 100%
rename from build/jam/NetBootArchive
rename to build/jam/images/NetBootArchive