diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index 25558c5ef4..fd5353c90a 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -44,12 +44,12 @@ export BE_DEFAULT_CPLUS_FLAGS=""
 
 if [ "$SAFEMODE" != "yes" ]
 then
-	export PATH=.:$HOME/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
-	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/beos/system/lib"
+	export PATH=.:$HOME/config/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
+	export LIBRARY_PATH="%A/lib:$HOME/config/lib:/boot/common/lib:/boot/beos/system/lib"
 	export ADDON_PATH="%A/add-ons:$HOME/config/add-ons:/boot/beos/system/add-ons"
 else
-	export PATH=.:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
-	export LIBRARY_PATH="%A/lib:/boot/beos/system/lib"
+	export PATH=.:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:$BETOOLS
+	export LIBRARY_PATH="%A/lib:/boot/common/lib:/boot/beos/system/lib"
 	export ADDON_PATH="%A/add-ons:/boot/beos/system/add-ons"
 fi
 
diff --git a/src/system/runtime_loader/runtime_loader.c b/src/system/runtime_loader/runtime_loader.c
index 7a178e96c9..90524c3024 100644
--- a/src/system/runtime_loader/runtime_loader.c
+++ b/src/system/runtime_loader/runtime_loader.c
@@ -59,18 +59,20 @@ search_path_for_type(image_type type)
 
 	switch (type) {
 		case B_APP_IMAGE:
-			return "/bin:"
-				"/boot/apps:"
-				"/boot/preferences:"
-				"/boot/beos/apps:"
-				"/boot/beos/preferences:"
-				"/boot/develop/tools/gnupro/bin";
+			return "/boot/common/bin"
+				":/bin"
+				":/boot/apps"
+				":/boot/preferences"
+				":/boot/beos/apps"
+				":/boot/beos/preferences"
+				":/boot/develop/tools/gnupro/bin";
 
 		case B_LIBRARY_IMAGE:
-			return "%A/lib:/boot/beos/system/lib";
+			return "%A/lib:/boot/common/lib:/boot/beos/system/lib";
 
 		case B_ADD_ON_IMAGE:
 			return "%A/add-ons"
+				":/boot/common/add-ons"
 				":/boot/beos/system/add-ons";
 
 		default: