diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index c75177a179..10d3640c88 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -14,6 +14,7 @@ if $(HAIKU_ADD_ALTERNATIVE_GCC_LIBS) && $(HAIKU_ALTERNATIVE_GCC_OUTPUT_DIR) {
 #	APR
 #	APR-util
 #	Beam
+#	BePDF
 #	Bluetooth
 #	CVS
 #	Development
@@ -87,6 +88,23 @@ if [ IsOptionalHaikuImagePackageAdded Beam ] {
 }
 
 
+# BePDF
+if [ IsOptionalHaikuImagePackageAdded BePDF ] {
+	if $(TARGET_ARCH) != x86 {
+		Echo "No optional package BePDF available for $(TARGET_ARCH)" ;
+	} else if $(HAIKU_GCC_VERSION[1]) >= 4 && $(isHybridBuild) = 0 {
+		Echo "No optional package BePDF available for gcc4" ;
+	} else {
+		InstallOptionalHaikuImagePackage BePDF
+			: http://haiku-files.org/files/optional-packages/BePDF-1.0.0b2.x86.zip
+			: apps
+		;
+		AddSymlinkToHaikuImage home config be Applications
+			: /boot/apps/BePDF/BePDF ;
+	}
+}
+
+
 # Bluetooth stack
 if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
 	local bluetoothDrivers = h2generic ;