diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 48ec967db6..ef14c5b40e 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -400,6 +400,14 @@ if [ IsOptionalHaikuImagePackageAdded DevelopmentBase ]
 		# symlink cpp to g++'s headers
 		AddSymlinkToHaikuImage develop abi x86 gcc4 headers
 			: ../tools/current/include/g++ : cpp ;
+
+		# symlink to the appropriate system/lib[/gcc4] folder
+		local libs = libstdc++.so libsupc++.so ;
+		for lib in $(libs) {
+			AddSymlinkToHaikuHybridImage
+				develop abi x86 gcc4 tools gcc-4.3.3-haiku-090629 lib
+				: /system/lib $(lib) : : true ;
+		}
 	}
 
 	# other commonly used tools