diff --git a/src/system/runtime_loader/runtime_loader.c b/src/system/runtime_loader/runtime_loader.c
index eab17243dd..f435a5db49 100644
--- a/src/system/runtime_loader/runtime_loader.c
+++ b/src/system/runtime_loader/runtime_loader.c
@@ -59,7 +59,9 @@ search_path_for_type(image_type type)
 
 	switch (type) {
 		case B_APP_IMAGE:
-			return "/boot/common/bin"
+			return "/boot/home/config/bin"
+						// TODO: Remove!
+				":/boot/common/bin"
 				":/bin"
 				":/boot/apps"
 				":/boot/preferences"
@@ -68,10 +70,15 @@ search_path_for_type(image_type type)
 				":/boot/develop/tools/gnupro/bin";
 
 		case B_LIBRARY_IMAGE:
-			return "%A/lib:/boot/common/lib:/boot/beos/system/lib";
+			return "%A/lib"
+				":/boot/home/config/lib"
+					// TODO: Remove!
+				":/boot/common/lib:/boot/beos/system/lib";
 
 		case B_ADD_ON_IMAGE:
 			return "%A/add-ons"
+				":/boot/home/config/add-ons"
+					// TODO: Remove!
 				":/boot/common/add-ons"
 				":/boot/beos/system/add-ons";