diff --git a/common/shlibs b/common/shlibs
index 218746ca0f..b67b7b932e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1519,3 +1519,6 @@ libdovecot-lda.so.0 dovecot-2.2.11_2
 libnetapi.so.0 samba-3.6.23_1
 libsmbsharemodes.so.0 samba-3.6.23_1
 libmysqld.so.18 libmariadbclient-5.5.36_1
+libwsutil.so.3 libwireshark-1.10.6_1
+libwireshark.so.3 libwireshark-1.10.6_1
+libwiretap.so.3 libwireshark-1.10.6_1
diff --git a/srcpkgs/libwireshark b/srcpkgs/libwireshark
new file mode 120000
index 0000000000..bb29b6f1b4
--- /dev/null
+++ b/srcpkgs/libwireshark
@@ -0,0 +1 @@
+wireshark
\ No newline at end of file
diff --git a/srcpkgs/libwireshark-devel b/srcpkgs/libwireshark-devel
new file mode 120000
index 0000000000..bb29b6f1b4
--- /dev/null
+++ b/srcpkgs/libwireshark-devel
@@ -0,0 +1 @@
+wireshark
\ No newline at end of file
diff --git a/srcpkgs/wireshark/INSTALL b/srcpkgs/wireshark/INSTALL
new file mode 100644
index 0000000000..2dc46f548f
--- /dev/null
+++ b/srcpkgs/wireshark/INSTALL
@@ -0,0 +1,14 @@
+case "${ACTION}" in
+post)
+	chown wireshark usr/bin/dumpcap
+	/usr/sbin/setcap 'CAP_NET_RAW+eip CAP_NET_ADMIN+eip' usr/bin/dumpcap
+	cat <<_EOF
+=================================================================
+
+You should also add your user to the 'wireshark' group to be able
+to capture traffic
+
+==================================================================
+_EOF
+	;;
+esac
diff --git a/srcpkgs/wireshark/template b/srcpkgs/wireshark/template
new file mode 100644
index 0000000000..3bc1269947
--- /dev/null
+++ b/srcpkgs/wireshark/template
@@ -0,0 +1,65 @@
+# Template file for 'wireshark'
+pkgname=wireshark
+version=1.10.6
+revision=1
+build_style=gnu-configure
+configure_args=" --with-ssl \
+ --with-pcap \
+ --with-libcap \
+ --with-zlib \
+ --with-lua \
+ --with-krb5 \
+ --without-portaudio"
+hostmakedepends="pkg-config bison flex perl"
+makedepends="libpcap-devel zlib-devel lua-devel libcap-devel mit-krb5-devel gtk+-devel"
+depends="libcap-progs"
+short_desc="A graphical network protocol analyzer for Unix/Linux"
+maintainer="Enno Boland <eb@s01.de>"
+homepage="http://www.wireshark.org"
+license="GPL-2"
+distfiles="http://www.wireshark.org/download/src/${pkgname}-${version}.tar.bz2"
+checksum=a9de3fd3002d4df0946cfea2f5a33557666e14c7014dbc42d1f78dfe113f6b5d
+system_groups="wireshark"
+
+post_install() {
+	local _includeDir=usr/include/wireshark
+	# Icons
+	for d in 16 32 48; do
+		vinstall image/hi${d}-app-wireshark.png 644 \
+			usr/share/icons/hicolor/${d}x${d}/apps/wireshark.png
+	done
+
+	 for d in 16 24 32 48 64 128 256 ; do
+		vinstall image/WiresharkDoc-${d}.png 644 \
+			usr/share/icons/hicolor/${d}x${d}/mimetypes/application-vnd.tcpdump.pcap.png
+	 done
+	
+	# Desktop Launcher
+	vinstall wireshark.desktop 644 usr/share/applications/wireshark.desktop
+
+	# Headers
+	vmkdir $_includeDir
+	vcopy "color.h config.h register.h ws_symbol_export.h" $_includeDir
+
+	for i in wiretap wsutil; do
+		vmkdir $_includeDir/$i
+		vcopy "$i/*.h" $_includeDir/$i
+	done
+}
+
+libwireshark_package() {
+	short_desc+=" - library"
+	pkg_install() {
+		vmove usr/lib/*.so.*
+		vmove usr/lib/wireshark
+	}
+}
+
+libwireshark-devel_package() {
+	short_desc+=" - development files"
+	depends="libwireshark>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/*.so
+	}
+}