diff --git a/makehdimage b/makehdimage
index 408fe8b03f..f9a3c1d922 100755
--- a/makehdimage
+++ b/makehdimage
@@ -117,7 +117,8 @@ BEOS_PREFERENCES="Backgrounds DataTranslations FileTypes Media Menu Mouse \
 
 BEOS_SYSTEM_LIB="libbe.so libstdc++.r4.so libnet.so libmedia.so libtracker.so \
 	libtranslation.so libbind.so libnetapi.so libsocket.so libdebug.so \
-	libtextencoding.so libz.so libfreetype.so libpng.so libappserver.so"
+	libtextencoding.so libz.so libfreetype.so libpng.so libappserver.so \
+	libdevice.so"
 
 BEOS_SYSTEM_SERVERS="registrar debug_server syslog_daemon media_server \
 	media_addon_server input_server app_server fake_app_server"
diff --git a/src/kits/device/Jamfile b/src/kits/device/Jamfile
index 3ee2e7375f..667498b287 100644
--- a/src/kits/device/Jamfile
+++ b/src/kits/device/Jamfile
@@ -6,10 +6,7 @@ SharedLibrary device :
 	DigitalPort.cpp
 	Joystick.cpp
 	SerialPort.cpp
-;
-
-LinkSharedOSLibs libdevice.so :
-	be
+	: libbe.so libroot.so
 ;
 
 MakeLocate <develop>libdevice.so : $(OBOS_STLIB_DIR) ;