diff --git a/build/jam/images/definitions/minimum b/build/jam/images/definitions/minimum
index 8b55f08a6a..5c3ff3858e 100644
--- a/build/jam/images/definitions/minimum
+++ b/build/jam/images/definitions/minimum
@@ -89,13 +89,14 @@ rule HaikuImageGetSystemLibs
 		# libs with standard grist
 		[ MultiArchDefaultGristFiles [ FFilterByBuildFeatures
 			libbe.so libbsd.so libbnetapi.so
-			libdebug.so libdevice.so
+			libdebug.so 
+			libdebugger.so@primary
+			libdevice.so
 			libgnu.so
 			libnetwork.so
 			libpackage.so
 			libtextencoding.so libtracker.so libtranslation.so
 		] ]
-		libdebugger.so@primary
 		;
 }
 
diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index 916c4e7898..fb563fb35e 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -71,7 +71,9 @@ rule HaikuImageGetSystemLibs
 			libalm.so
 			libbe.so libbsd.so libbnetapi.so
 			libbluetooth.so
-			libdebug.so libdevice.so
+			libdebug.so 
+			libdebugger.so@primary
+			libdevice.so
 			libgame.so libglut.so@mesa libgnu.so
 			libmail.so libmedia.so libmidi.so libmidi2.so
 			libnetwork.so
@@ -79,7 +81,6 @@ rule HaikuImageGetSystemLibs
 			libscreensaver.so
 			libtextencoding.so libtracker.so libtranslation.so
 		] ]
-		libdebugger.so@primary
 		;
 }