diff --git a/build/jam/OptionalPackages b/build/jam/OptionalPackages
index 850d85e431..2f0bc5a407 100644
--- a/build/jam/OptionalPackages
+++ b/build/jam/OptionalPackages
@@ -3,6 +3,7 @@
 # be used
 
 # Available Optional Packages:
+#	Bluetooth
 #	Development
 #	Firefox
 #	Links
@@ -302,3 +303,17 @@ if [ IsOptionalHaikuImagePackageAdded WonderBrush ] {
 			: /boot/apps/WonderBrush/WonderBrush ;
 	}
 }
+
+# Bluetooth stack
+if [ IsOptionalHaikuImagePackageAdded Bluetooth ] {
+	local BEOS_ADD_ONS_DRIVERS_BLUETOOTH = h2generic ;
+	AddDriversToHaikuImage bluetooth : $(BEOS_ADD_ONS_DRIVERS_BLUETOOTH) ;
+	AddFilesToHaikuImage beos system servers : bluetooth_server ;
+	AddFilesToHaikuImage beos system lib : libbluetooth.so ;
+	AddFilesToHaikuImage beos bin : bt_dev_info bt_discovery ;
+	
+	if [ IsOptionalHaikuImagePackageAdded Development ] {
+		AddSymlinkToHaikuImage develop lib x86 : /system/lib/libbluetooth.so ;
+	}
+}
+