diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 0a4be3fc91..98dced5a9d 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -475,6 +475,9 @@ if [ IsOptionalHaikuImagePackageAdded CVS ] {
 
 # Development
 if [ IsOptionalHaikuImagePackageAdded Development ] && $(TARGET_ARCH) = x86 {
+	AddFilesToHaikuImage system apps : Debugger ;
+	AddSymlinkToHaikuImage home config settings deskbar Applications
+		: /boot/system/apps/Debugger : Debugger ;
 	# autotools
 	if $(HAIKU_GCC_VERSION[1]) >= 4 {
 		InstallOptionalHaikuImagePackage