diff --git a/net/Makefile b/net/Makefile
index 1ac583fdeeb6..884763b2378b 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1244,6 +1244,7 @@
     SUBDIR += wired-tracker
     SUBDIR += wireshark
     SUBDIR += wireshark-lite
+    SUBDIR += wlan2eth
     SUBDIR += wmlj
     SUBDIR += wmnd
     SUBDIR += wmnet
diff --git a/net/wlan2eth/Makefile b/net/wlan2eth/Makefile
new file mode 100644
index 000000000000..b4dcc0257511
--- /dev/null
+++ b/net/wlan2eth/Makefile
@@ -0,0 +1,32 @@
+# Created by: Rusmir Dusko <nemysis@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	wlan2eth
+PORTVERSION=	1.3
+CATEGORIES=	net security
+MASTER_SITES=	http://www.willhackforsushi.com/code/${PORTNAME}/
+EXTRACT_SUFX=	.tgz
+
+MAINTAINER=	nemysis@FreeBSD.org
+COMMENT=	Convert packet captures in 802.11 format to Ethernet format
+
+LICENSE=	GPLv2
+
+PORTDOCS=	THANKS
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	bin/${PORTNAME}
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|CFLAGS		=|CFLAGS	?=|' \
+		${WRKSRC}/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
+.include <bsd.port.mk>
diff --git a/net/wlan2eth/distinfo b/net/wlan2eth/distinfo
new file mode 100644
index 000000000000..1166397aa251
--- /dev/null
+++ b/net/wlan2eth/distinfo
@@ -0,0 +1,2 @@
+SHA256 (wlan2eth-1.3.tgz) = a6b9f4a9f0407f79e61571de73e800785d4047019d66b891a569ff75cc5fe774
+SIZE (wlan2eth-1.3.tgz) = 8242
diff --git a/net/wlan2eth/files/pkg-message.in b/net/wlan2eth/files/pkg-message.in
new file mode 100644
index 000000000000..e53216ead092
--- /dev/null
+++ b/net/wlan2eth/files/pkg-message.in
@@ -0,0 +1,9 @@
+===============================================================================
+
+wlan2eth has been installed.
+
+For more information about wlan2eth visit:
+
+http://www.willhackforsushi.com/?page_id=79
+
+===============================================================================
diff --git a/net/wlan2eth/pkg-descr b/net/wlan2eth/pkg-descr
new file mode 100644
index 000000000000..e834d8cc419a
--- /dev/null
+++ b/net/wlan2eth/pkg-descr
@@ -0,0 +1,11 @@
+A simple tool to convert packet captures in 802.11 format to Ethernet format.
+Lots of tools can only understand Ethernet link types, so I wrote this 
+tool to convert captures to a format that they can understand.
+Note that this tool is really only useful for encrypted traffic.
+
+Specify a wireless packet capture as an input file, and the name of the
+desired Ethernet-format output file. Wlan2eth will only convert data frames
+to the output file, which will likely result in a significantly smaller output
+packet capture file. Note that wlan2eth will only convert unencrypted frames.
+
+WWW: http://www.willhackforsushi.com/?page_id=79