diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 6c1f67a871..54bf2b77fa 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -180,7 +180,10 @@ SYSTEM_ADD_ONS_DRIVERS_NET = $(X86_ONLY)3com $(X86_ONLY)atheros813x
 	usb_ecm usb_asix
 
 	# WLAN drivers
-	$(X86_ONLY)atheroswifi $(X86_ONLY)iprowifi3945
+	$(X86_ONLY)atheroswifi $(X86_ONLY)iprowifi3945 $(X86_ONLY)iprowifi4965
+	$(X86_ONLY)marvell88w8363 $(X86_ONLY)ralinkwifi
+	$(X86_ONLY)ipw2100 $(X86_ONLY)iprowifi2200
+	$(X86_ONLY)marvell88w8335 $(X86_ONLY)broadcom43xx
 ;
 #SYSTEM_ADD_ONS_DRIVERS_POWER = $(X86_ONLY)acpi_button ;
 SYSTEM_ADD_ONS_BUS_MANAGERS =  $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
@@ -189,6 +192,14 @@ SYSTEM_ADD_ONS_BUS_MANAGERS =  $(ATA_ONLY)ata pci $(X86_ONLY)ps2 $(X86_ONLY)isa
 SYSTEM_ADD_ONS_FILE_SYSTEMS = bfs cdda ext2 fat iso9660 nfs attribute_overlay
 	write_overlay ntfs reiserfs udf ; #googlefs
 
+# wifi firmware
+for driver in $(SYSTEM_ADD_ONS_DRIVERS_NET) {
+	local package = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_PACKAGE) ] ;
+	local archive = [ on $(driver) return $(HAIKU_WIFI_FIRMWARE_ARCHIVE) ] ;
+	if $(archive) {
+		AddWifiFirmwareToHaikuImage $(driver) : $(package) : $(archive) ;
+	}
+}
 
 # modules
 AddFilesToHaikuImage system add-ons kernel bus_managers
@@ -306,6 +317,8 @@ SEARCH on which = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToHaikuImage system bin			: which ;
 SEARCH on installoptionalpackage = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToHaikuImage system bin			: installoptionalpackage ;
+SEARCH on install-wifi-firmwares.sh = [ FDirName $(HAIKU_TOP) data bin ] ;
+AddFilesToHaikuImage system bin			: install-wifi-firmwares.sh ;
 
 AddSymlinkToHaikuImage system bin : bash : sh ;
 AddSymlinkToHaikuImage system bin : trash : untrash ;
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
index 963fbc50a5..3546fb539a 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi3945/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi3945 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] 
+	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -21,3 +22,7 @@ KernelAddon iprowifi3945 :
 	libfreebsd_wlan.a
 	libfreebsd_network.a
 	;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi3945 = iwlwifi-3945-ucode-2.14.1.5 ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi3945 = iwlwifi-3945-ucode-2.14.1.5.tgz ;
+
diff --git a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
index 947944eaf6..8f55266b61 100644
--- a/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/iprowifi4965/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan iprowifi4965 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] 
+	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -22,3 +23,7 @@ KernelAddon iprowifi4965 :
 	libfreebsd_wlan.a
 	libfreebsd_network.a
 	;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on iprowifi4965 = iwlwifi-4965-ucode-4.44.1.20 ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on iprowifi4965 = iwlwifi-4965-ucode-4.44.1.20.tgz ;
+
diff --git a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
index b0f5b842c2..6790f5d25a 100644
--- a/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/marvell88w8363/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan marvell88w8363 ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] 
+	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -25,3 +26,7 @@ KernelAddon marvell88w8363 :
 	libfreebsd_wlan.a
 	libfreebsd_network.a
 	;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on marvell88w8363 = "" ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on marvell88w8363 = 88w8363-fw-3.6.2.2.zip ;
+
diff --git a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
index b35841b74f..529b06da2d 100644
--- a/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
+++ b/src/add-ons/kernel/drivers/network/wlan/ralinkwifi/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel drivers network wlan ralinkwifi ;
 
-UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ] : true ;
+UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_network compat ]
+	: true ;
 UseHeaders [ FDirName $(HAIKU_TOP) src libs compat freebsd_wlan ] : true ;
 UsePrivateHeaders net system ;
 UsePrivateKernelHeaders ;
@@ -23,3 +24,7 @@ KernelAddon ralinkwifi :
 	libfreebsd_wlan.a
 	libfreebsd_network.a
 	;
+
+HAIKU_WIFI_FIRMWARE_PACKAGE on ralinkwifi = RT61_Firmware_V1.2 ;
+HAIKU_WIFI_FIRMWARE_ARCHIVE on ralinkwifi = RT61_Firmware_V1.2.zip ;
+