diff --git a/common/shlibs b/common/shlibs
index a5ba713f755..93b17119c6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2346,3 +2346,6 @@ libIrcCore.so.3 libcommuni-3.4.0_1
 libIrcModel.so.3 libcommuni-3.4.0_1
 libtolua.so tolua-5.2.0_1
 libhwloc.so.5 libhwloc-1.11.2_1
+libnetfilter_cttimeout.so.1 libnetfilter_cttimeout-1.0.0_1
+libnetfilter_cthelper.so.0 libnetfilter_cthelper-1.0.0_1
+libnetfilter_queue.so.1 libnetfilter_queue-1.0.2_1
diff --git a/srcpkgs/conntrack-tools/template b/srcpkgs/conntrack-tools/template
new file mode 100644
index 00000000000..f92b99662e3
--- /dev/null
+++ b/srcpkgs/conntrack-tools/template
@@ -0,0 +1,20 @@
+# Template file for 'conntrack-tools'
+pkgname=conntrack-tools
+version=1.4.3
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config flex"
+makedepends="libnfnetlink-devel libnetfilter_conntrack-devel libnetfilter_cttimeout-devel libnetfilter_cthelper-devel libnetfilter_queue-devel libmnl-devel"
+short_desc="Tools to interact with the netfilter connection tracking system"
+maintainer="Michael Gehring <mg@ebfe.org>"
+license="GPL-2"
+homepage="http://conntrack-tools.netfilter.org/"
+distfiles="http://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-${version}.tar.bz2"
+checksum=af3ccc60356cfedf941065fdaaf9cd5e51f3df7484f56858af37106feecf3f57
+
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libtirpc-devel"
+		CFLAGS="-D_GNU_SOURCE -I${XBPS_CROSS_BASE}/usr/include/tirpc"
+		LDFLAGS="-ltirpc"
+		;;
+esac
diff --git a/srcpkgs/libnetfilter_cthelper-devel b/srcpkgs/libnetfilter_cthelper-devel
new file mode 120000
index 00000000000..82f34a8e213
--- /dev/null
+++ b/srcpkgs/libnetfilter_cthelper-devel
@@ -0,0 +1 @@
+libnetfilter_cthelper
\ No newline at end of file
diff --git a/srcpkgs/libnetfilter_cthelper/template b/srcpkgs/libnetfilter_cthelper/template
new file mode 100644
index 00000000000..0e784ff7d48
--- /dev/null
+++ b/srcpkgs/libnetfilter_cthelper/template
@@ -0,0 +1,24 @@
+# Template file for 'libnetfilter_cthelper'
+pkgname=libnetfilter_cthelper
+version=1.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libmnl-devel"
+short_desc="Interface to the connection tracking user-space helper infrastructure"
+maintainer="Michael Gehring <mg@ebfe.org>"
+license="GPL-2"
+homepage="http://www.netfilter.org/projects/libnetfilter_cthelper/index.html"
+distfiles="http://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-${version}.tar.bz2"
+checksum=07618e71c4d9a6b6b3dc1986540486ee310a9838ba754926c7d14a17d8fccf3d
+
+libnetfilter_cthelper-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}
+
diff --git a/srcpkgs/libnetfilter_cttimeout-devel b/srcpkgs/libnetfilter_cttimeout-devel
new file mode 120000
index 00000000000..4484e4a558e
--- /dev/null
+++ b/srcpkgs/libnetfilter_cttimeout-devel
@@ -0,0 +1 @@
+libnetfilter_cttimeout
\ No newline at end of file
diff --git a/srcpkgs/libnetfilter_cttimeout/template b/srcpkgs/libnetfilter_cttimeout/template
new file mode 100644
index 00000000000..e424abb918c
--- /dev/null
+++ b/srcpkgs/libnetfilter_cttimeout/template
@@ -0,0 +1,24 @@
+# Template file for 'libnetfilter_cttimeout'
+pkgname=libnetfilter_cttimeout
+version=1.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libmnl-devel"
+short_desc="Interface to the fine-grain connection tracking timeout infrastructure"
+maintainer="Michael Gehring <mg@ebfe.org>"
+license="GPL-2"
+homepage="http://www.netfilter.org/projects/libnetfilter_cttimeout/index.html"
+distfiles="http://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-${version}.tar.bz2"
+checksum=aeab12754f557cba3ce2950a2029963d817490df7edb49880008b34d7ff8feba
+
+libnetfilter_cttimeout-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}
+
diff --git a/srcpkgs/libnetfilter_queue-devel b/srcpkgs/libnetfilter_queue-devel
new file mode 120000
index 00000000000..ff12558142d
--- /dev/null
+++ b/srcpkgs/libnetfilter_queue-devel
@@ -0,0 +1 @@
+libnetfilter_queue
\ No newline at end of file
diff --git a/srcpkgs/libnetfilter_queue/template b/srcpkgs/libnetfilter_queue/template
new file mode 100644
index 00000000000..03463a6e784
--- /dev/null
+++ b/srcpkgs/libnetfilter_queue/template
@@ -0,0 +1,31 @@
+# Template file for 'libnetfilter_queue'
+pkgname=libnetfilter_queue
+version=1.0.2
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config"
+makedepends="libnfnetlink-devel libmnl-devel"
+short_desc="An API to packets that have been queued by the kernel packet filter"
+maintainer="Michael Gehring <mg@ebfe.org>"
+license="GPL-2"
+homepage="http://www.netfilter.org/projects/libnetfilter_queue/index.html"
+distfiles="http://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-${version}.tar.bz2"
+checksum=838490eb5dbe358f9669823704982f5313a8d397111562373200203f93ac1a32
+
+CFLAGS="-D_GNU_SOURCE"
+
+pre_configure() {
+	sed -i '15i#include <sys/time.h>' include/libnetfilter_queue/libnetfilter_queue.h
+	sed -i 's/u_int\([0-9]*\)_t/uint\1_t/g' $(find -name '*.[ch]')
+}
+
+libnetfilter_queue-devel_package() {
+	depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+		vmove usr/lib/pkgconfig
+	}
+}
+