diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index a8b9588629..0572b19e7a 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -13,27 +13,24 @@ BUILDHOME=/boot/develop
 case `uname -m` in
 BePC|Intel|unknown)
 	BE_HOST_CPU=x86
-	BETOOLS="$BUILDHOME/bin"
-	BELIBRARIES="$BUILDHOME/lib/$BE_HOST_CPU"
+	BETOOLS="$BUILDHOME/tools/gnupro/bin"
 	;;
 BeMac|BeBox)
 	BE_HOST_CPU=ppc
 	BETOOLS="$BUILDHOME/bin"
-	BELIBRARIES="$BUILDHOME/lib/$BE_HOST_CPU"
-	BELIBFILES="glue-noinit.a;init_term_dyn.o;start_dyn.o;libroot.so;libbe.so;libtracker.so;libmedia.so;libnet.so;libnetdev.so;libdevice.so;libmidi.so;libgame.so;libatalk.so;libmail.so"
 	;;
 *)
 	BE_HOST_CPU=unknown
 	BETOOLS="$BUILDHOME/bin"
 esac
 
+BELIBRARIES="$BUILDHOME/lib/$BE_HOST_CPU"
 BH=$BUILDHOME/headers
 BEINCLUDES="$BH;$BH/be;$BH/be/precompiled;$BH/be/bone;$BH/posix;$BH/cpp;$BH/be/app;$BH/be/device;$BH/be/interface;$BH/be/media;$BH/be/midi;$BH/be/midi2;$BH/be/net;$BH/be/kernel;$BH/be/storage;$BH/be/support;$BH/be/game;$BH/be/opengl;$BH/be/drivers;$BH/gnu;$BH/be/mail;$BH/be/translation;$BH/be/devel;$BH/be/add-ons/graphics;$BH/be/be_apps/Deskbar;$BH/be/be_apps/NetPositive;$BH/be/be_apps/Tracker"
 
 export BUILDHOME
 export BETOOLS
 export BELIBRARIES
-export BELIBFILES
 export BEINCLUDES
 export BE_HOST_CPU