diff --git a/sysutils/iwi-firmware3/DESCR b/sysutils/iwi-firmware3/DESCR
new file mode 100644
index 000000000000..9db1ebe6b629
--- /dev/null
+++ b/sysutils/iwi-firmware3/DESCR
@@ -0,0 +1,16 @@
+Firmware binary images for use with the iwi(4) driver.
+This is version 3.0 of the firmware which is not compatible
+with older drivers.
+
+Original archive is available from Intel at:
+http://ipw2200.sourceforge.net/firmware.php?fid=4
+
+There are four different images:
+
+iwi-boot.fw		Boot firmware
+iwi-bss.fw		BSS mode (aka infrastructure mode) firmware
+iwi-ibss.fw		IBSS mode (aka ad-hoc mode) firmware
+iwi-ucode-bss.fw	BSS mode microcode
+iwi-ucode-ibss.fw	IBSS mode microcode
+
+To download firmware to your adapter, use the iwictl(8) tool.
diff --git a/sysutils/iwi-firmware3/Makefile b/sysutils/iwi-firmware3/Makefile
new file mode 100644
index 000000000000..bf1f44c4efc6
--- /dev/null
+++ b/sysutils/iwi-firmware3/Makefile
@@ -0,0 +1,38 @@
+# $NetBSD: Makefile,v 1.1.1.1 2006/12/20 17:32:31 joerg Exp $
+#
+
+DISTNAME=		ipw2200-fw-3.0
+PKGNAME=		iwi-firmware3-3.0
+CATEGORIES=		sysutils
+MASTER_SITES=		http://damien.bergamini.free.fr/iwifw/
+EXTRACT_SUFX=		.tgz
+
+MAINTAINER=		Damien.Bergamini@Free.FR
+HOMEPAGE=		http://damien.bergamini.free.fr/ipw/
+COMMENT=		Firmware binary images for iwi(4) driver
+
+CONFLICTS+=		iwi-firmware-[0-9]*
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+LICENSE=		intel-ipw-license
+
+RESTRICTED=		Intel Licensed Software: see http://ipw2200.sourceforge.net/firmware.php?fid=7
+NO_SRC_ON_CDROM=	${RESTRICTED}
+NO_BIN_ON_CDROM=	${RESTRICTED}
+NO_SRC_ON_FTP=		${RESTRICTED}
+NO_BIN_ON_FTP=		${RESTRICTED}
+
+NO_CONFIGURE=		yes
+NO_BUILD=		yes
+
+INSTALLATION_DIRS+=	libdata/if_iwi
+
+do-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}/${PREFIX}/libdata/if_iwi
+	${INSTALL_DATA} ${WRKSRC}/LICENSE.ipw2200-fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/LICENSE
+	${INSTALL_DATA} ${WRKSRC}/ipw2200-bss.fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/iwi-bss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw2200-ibss.fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/iwi-ibss.fw
+	${INSTALL_DATA} ${WRKSRC}/ipw2200-sniffer.fw ${DESTDIR}/${PREFIX}/libdata/if_iwi/iwi-sniffer.fw
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/iwi-firmware3/PLIST b/sysutils/iwi-firmware3/PLIST
new file mode 100644
index 000000000000..fcd26ebff0c3
--- /dev/null
+++ b/sysutils/iwi-firmware3/PLIST
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/20 17:32:31 joerg Exp $
+libdata/if_iwi/LICENSE
+libdata/if_iwi/iwi-bss.fw
+libdata/if_iwi/iwi-ibss.fw
+libdata/if_iwi/iwi-sniffer.fw
+@dirrm libdata/if_iwi
diff --git a/sysutils/iwi-firmware3/distinfo b/sysutils/iwi-firmware3/distinfo
new file mode 100644
index 000000000000..bbc964ea9ff2
--- /dev/null
+++ b/sysutils/iwi-firmware3/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2006/12/20 17:32:31 joerg Exp $
+
+SHA1 (ipw2200-fw-3.0.tgz) = 84c28f1bed09c4d54bedf43492bd7884d0593928
+RMD160 (ipw2200-fw-3.0.tgz) = 6dafe3ef609176eec0f119df93fd586094892100
+Size (ipw2200-fw-3.0.tgz) = 269999 bytes