diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 4dde1d078f..2e773430f0 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -17,6 +17,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	Beam
 #	BeBook
 #	BeHappy
+#	BeOSCompatibility
 #	BePDF
 #	Bluetooth
 #	CVS
@@ -126,6 +127,18 @@ if [ IsOptionalHaikuImagePackageAdded BeHappy ] {
 }
 
 
+# BeOSCompatibility
+if [ IsOptionalHaikuImagePackageAdded BeOSCompatibility ] {
+	Echo "Warning: Adding BeOS compatibility symlinks. This will go away. Please fix your apps!" ;
+	AddSymlinkToHaikuImage beos : ../system/apps ;
+	AddSymlinkToHaikuImage beos : ../system/bin ;
+	AddSymlinkToHaikuImage beos : ../system/documentation ;
+	AddSymlinkToHaikuImage beos : ../system/etc ;
+	AddSymlinkToHaikuImage beos : ../system/preferences ;
+	AddSymlinkToHaikuImage beos : ../system ;
+}
+
+
 # BePDF
 if [ IsOptionalHaikuImagePackageAdded BePDF ] {
 	if $(TARGET_ARCH) != x86 {