diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index f4dc3ea89e..eb396ddac8 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -54,6 +54,7 @@ source "package/usbutils/Config.in"
 source "package/kismet/Config.in"
 source "package/nmap/Config.in"
 source "package/l2tpd/Config.in"
+source "package/tinc/Config.in"
 
 comment "Libraries"
 source "package/libgcc/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 71b01d0001..6cbadad24a 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -61,6 +61,7 @@ package-$(BR2_PACKAGE_SNORT) += snort
 package-$(BR2_PACKAGE_SPEEX) += speex
 package-$(BR2_PACKAGE_STRACE) += strace
 package-$(BR2_PACKAGE_TCPDUMP) += tcpdump
+package-$(BR2_PACKAGE_TINC) += tinc
 package-$(BR2_PACKAGE_UCLIBCXX) += uclibc++
 package-$(BR2_PACKAGE_USBUTILS) += usbutils
 package-$(BR2_PACKAGE_WIRELESS_TOOLS) += wireless-tools
@@ -109,6 +110,7 @@ mysql-compile: ncurses-compile zlib-compile
 postgresql-compile: zlib-compile
 nmap-compile: uclibc++-compile pcre-compile libpcap-compile
 kismet-compile: uclibc++-compile libpcap-compile
+tinc-compile: zlib-compile openssl-compile lzo-compile
 
 snort-compile: libnet-compile libpcap-compile pcre-compile
 ifeq ($(BR2_PACKAGE_SNORT_MYSQL),y)
diff --git a/openwrt/package/tinc/Config.in b/openwrt/package/tinc/Config.in
new file mode 100644
index 0000000000..d1937fa60e
--- /dev/null
+++ b/openwrt/package/tinc/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_TINC
+	tristate "tinc"
+	default m if CONFIG_DEVEL
+	select BR2_PACKAGE_ZLIB
+	select BR2_PACKAGE_LZO
+	select BR2_PACKAGE_OPENSSL
+	select BR2_PACKAGE_KMOD_TUN
+
+	help
+	  A VPN tunneling daemon
+	  
+	  http://www.tinc-vpn.org/
diff --git a/openwrt/package/tinc/Makefile b/openwrt/package/tinc/Makefile
new file mode 100644
index 0000000000..15c1b8cd88
--- /dev/null
+++ b/openwrt/package/tinc/Makefile
@@ -0,0 +1,74 @@
+# $Id$
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME := tinc
+PKG_VERSION := 1.0.3
+PKG_RELEASE := 1
+PKG_MD5SUM := 5dd1acf7d784e29aae78c31a2630fccd
+
+PKG_SOURCE_SITE := http://www.tinc-vpn.org/packages
+PKG_SOURCE_FILE := $(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_CAT := zcat
+PKG_SOURCE_DIR := $(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_SOURCE_DIR)
+PKG_IPK := $(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk
+PKG_CAT := zcat
+PKG_IPK_DIR := $(PKG_BUILD_DIR)/ipkg
+
+$(DL_DIR)/$(PKG_SOURCE_FILE):
+	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE_FILE) $(PKG_MD5SUM) $(PKG_SOURCE_SITE)
+
+$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE_FILE)
+	$(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE_FILE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
+	touch $(PKG_BUILD_DIR)/.unpacked
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked
+	(cd $(PKG_BUILD_DIR) ; \
+	$(TARGET_CONFIGURE_OPTS) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	./configure \
+	--target=$(GNU_TARGET_NAME) \
+	--host=$(GNU_TARGET_NAME) \
+	--build=$(GNU_HOST_NAME) \
+	--prefix=/usr \
+	--exec-prefix=/usr \
+	--bindir=/usr/bin \
+	--sbindir=/usr/sbin \
+	--libexecdir=/usr/lib \
+	--datadir=/usr/share \
+	--infodir=/usr/share/info \
+	--mandir=/usr/share/man \
+	--localstatedir=/var \
+	--sysconfdir=/etc \
+	--with-kernel=$(LINUX_DIR) \
+	--with-zlib=$(STAGING_DIR)/usr/ \
+	$(DISABLE_NLS) )
+	touch $(PKG_BUILD_DIR)/.configured
+
+$(PKG_BUILD_DIR)/$(PKG_NAME): $(PKG_BUILD_DIR)/.configured
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	CC=$(TARGET_CC) \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	all
+
+$(PKG_IPK): $(PKG_BUILD_DIR)/$(PKG_NAME)
+	mkdir -p $(PKG_IPK_DIR)/usr/bin
+	$(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH)
+	cp $(PKG_BUILD_DIR)/src/tincd $(PKG_IPK_DIR)/usr/bin/
+	$(STRIP) $(PKG_IPK_DIR)/usr/bin/*
+	mkdir -p $(PACKAGE_DIR)
+	find $(PKG_IPK_DIR) -name CVS | xargs rm -rf
+	$(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR)
+
+$(IPKG_STATE_DIR)/info/tinc.list: $(PKG_IPK)
+	$(IPKG) install $(PKG_IPK)
+
+source: $(DL_DIR)/$(PKG_SOURCE)
+prepare: $(PKG_BUILD_DIR)/.unpacked
+compile: $(PKG_IPK)
+install: $(IPKG_STATE_DIR)/info/tinc.list
+
+clean:  
+	rm -rf $(PKG_BUILD_DIR)
+	rm -f $(PKG_IPK)
diff --git a/openwrt/package/tinc/tinc.control b/openwrt/package/tinc/tinc.control
new file mode 100644
index 0000000000..4c8d0f8b73
--- /dev/null
+++ b/openwrt/package/tinc/tinc.control
@@ -0,0 +1,7 @@
+Package: tinc
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: VPN tunnel daemon
+Depends: zlib, lzo, openssl, kmod-tun