diff --git a/build/jam/images/definitions/regular b/build/jam/images/definitions/regular
index a529be3569..d0672649bd 100644
--- a/build/jam/images/definitions/regular
+++ b/build/jam/images/definitions/regular
@@ -99,8 +99,11 @@ SYSTEM_SERVERS += [ FFilterByBuildFeatures
 	print_server print_addon_server
 ] ;
 
-
+# Bluetooth stack + drivers
 SYSTEM_BT_STACK = hci btCoreData ;
+SYSTEM_ADD_ONS_DRIVERS_BT_H2 +=
+	h2generic
+;
 
 SYSTEM_ADD_ONS_ACCELERANTS += [ FFilterByBuildFeatures
 	x86,x86_64 @{
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 83028f6878..3171592236 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -72,6 +72,7 @@ AddNewDriversToPackage power		: $(SYSTEM_ADD_ONS_DRIVERS_POWER) ;
 AddDriversToPackage					: console dprintf null <driver>tty usb_modeswitch zero ;
 AddDriversToPackage audio hmulti	: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO) ;
 AddDriversToPackage audio old		: $(SYSTEM_ADD_ONS_DRIVERS_AUDIO_OLD) ;
+AddDriversToPackage bluetooth h2	: $(SYSTEM_ADD_ONS_DRIVERS_BT_H2) ;
 AddDriversToPackage midi			: $(SYSTEM_ADD_ONS_DRIVERS_MIDI) ;
 AddDriversToPackage bus				: usb_raw fw_raw@x86 ;
 AddDriversToPackage disk floppy		: pc_floppy@x86 ;
@@ -263,6 +264,7 @@ AddFilesToPackage add-ons disk_systems
 	: <disk_system>fat <disk_system>intel <disk_system>gpt <disk_system>bfs
 		<disk_system>ntfs ;
 
+# Kernel bluetooth stack
 AddFilesToPackage add-ons kernel bluetooth : $(SYSTEM_BT_STACK) ;
 
 # the MIME DB