diff --git a/package/libs/libnetfilter-conntrack/Makefile b/package/libs/libnetfilter-conntrack/Makefile
index a97482e..357db2b 100644
--- a/package/libs/libnetfilter-conntrack/Makefile
+++ b/package/libs/libnetfilter-conntrack/Makefile
@@ -10,11 +10,12 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=libnetfilter_conntrack
 PKG_RELEASE:=2
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://git.netfilter.org/libnetfilter_conntrack
-PKG_SOURCE_DATE:=2018-05-01
-PKG_SOURCE_VERSION:=3ccae9f5b2a9564cd63699ba60e54a46bc0d73b6
-PKG_MIRROR_HASH:=c978ef0fa5b7379de2909ca5d9c599ac63b4f8166f5971d58f6e074a922d996f
+PKG_VERSION:=1.0.8
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://netfilter.org/projects/libnetfilter_conntrack/files/
+PKG_HASH:=0cd13be008923528687af6c6b860f35392d49251c04ee0648282d36b1faec1cf
+
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 
diff --git a/package/network/utils/conntrack-tools/Makefile b/package/network/utils/conntrack-tools/Makefile
new file mode 100644
index 0000000..60b2fb8
--- /dev/null
+++ b/package/network/utils/conntrack-tools/Makefile
@@ -0,0 +1,70 @@
+#
+# Copyright (C) 2009-2011 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=conntrack-tools
+PKG_VERSION:=1.4.6
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+	http://www.netfilter.org/projects/conntrack-tools/files \
+	ftp://ftp.netfilter.org/pub/conntrack-tools \
+	http://mirrors.evolva.ro/netfilter.org/conntrack-tools
+PKG_HASH:=590859cc848245dbfd9c6487761dd303b3a1771e007f4f42213063ca56205d5f
+
+PKG_MAINTAINER:=Jo-Philipp Wich <jow@openwrt.org>
+PKG_LICENSE:=GPL-2.0
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+TAR_OPTIONS += --exclude='*.rej'
+
+PKG_BUILD_DEPENDS:=libtirpc libnetfilter-conntrack
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/conntrack-tools
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libnetfilter-conntrack +libnetfilter-cttimeout +libnetfilter-cthelper +libnetfilter-queue
+  SUBMENU:=Firewall
+  TITLE:=Connection tracking userspace tools
+  URL:=http://conntrack-tools.netfilter.org/
+endef
+
+define Package/conntrack-tools/description
+ The conntrack-tools are a set of free software userspace tools for Linux
+ that allow system administrators interact with the Connection Tracking
+ System, which is the module that provides stateful packet inspection for
+ iptables. The conntrack-tools are the userspace daemon conntrackd and the
+ command line interface conntrack.
+endef
+
+define Package/conntrack-tools/conffiles
+/etc/conntrackd/conntrackd.conf
+endef
+
+TARGET_CFLAGS += -D_GNU_SOURCE=1
+
+define Package/conntrack-tools/install
+	$(INSTALL_DIR) $(1)/etc/conntrackd
+	$(INSTALL_CONF) \
+		$(PKG_BUILD_DIR)/doc/stats/conntrackd.conf \
+		$(1)/etc/conntrackd/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/conntrack \
+		$(PKG_INSTALL_DIR)/usr/sbin/conntrackd \
+		$(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/conntrackd.init $(1)/etc/init.d/conntrackd
+endef
+
+$(eval $(call BuildPackage,conntrack-tools))
diff --git a/package/network/utils/conntrack-tools/files/conntrackd.init b/package/network/utils/conntrack-tools/files/conntrackd.init
new file mode 100644
index 0000000..a51eb88
--- /dev/null
+++ b/package/network/utils/conntrack-tools/files/conntrackd.init
@@ -0,0 +1,17 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2015 OpenWrt.org
+
+START=21
+STOP=89
+
+USE_PROCD=1
+PROG="/usr/sbin/conntrackd"
+
+start_service() {
+	procd_open_instance
+
+	procd_set_param command $PROG -C /etc/conntrackd/conntrackd.conf
+	procd_set_param respawn
+
+	procd_close_instance
+}