diff --git a/net/tinc/Makefile b/net/tinc/Makefile
new file mode 100644
index 0000000000..2b127a54e3
--- /dev/null
+++ b/net/tinc/Makefile
@@ -0,0 +1,35 @@
+# $OpenBSD:$
+
+COMMENT =		Virtual Private Network (VPN) daemon
+DISTNAME =		tinc-1.0.23
+CATEGORIES =		net security
+
+HOMEPAGE =		http://www.tinc-vpn.org/
+
+MAINTAINER =		Rafael Sadowski <rafael@sizeofvoid.org>
+
+# GPLv2
+PERMIT_PACKAGE_CDROM =	Yes
+
+WANTLIB += c crypto lzo2 z
+
+
+MASTER_SITES =		http://www.tinc-vpn.org/packages/
+
+MODULES =		converters/libiconv \
+
+LIB_DEPENDS +=		archivers/lzo2 \
+
+USE_GMAKE =		Yes
+USE_LIBTOOL=		gnu
+
+CONFIGURE_STYLE = gnu
+
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+CONFIGURE_ARGS = --sysconfdir=/etc \
+		 --prefix=${LOCALBASE} \
+
+
+.include <bsd.port.mk>
diff --git a/net/tinc/distinfo b/net/tinc/distinfo
new file mode 100644
index 0000000000..cd690446e0
--- /dev/null
+++ b/net/tinc/distinfo
@@ -0,0 +1,2 @@
+SHA256 (tinc-1.0.23.tar.gz) = vPBr3xb/kDgh4z/BzmIZ1kKZcapazXD06KNbQzJEKBI=
+SIZE (tinc-1.0.23.tar.gz) = 465795
diff --git a/net/tinc/pkg/DESCR b/net/tinc/pkg/DESCR
new file mode 100644
index 0000000000..f986705988
--- /dev/null
+++ b/net/tinc/pkg/DESCR
@@ -0,0 +1,16 @@
+tinc is a Virtual Private Network (VPN) daemon that uses tunnelling and
+encryption to create a secure private network between hosts on the Internet.
+
+Because the tunnel appears to the IP level network code as a normal network
+device, there is no need to adapt any existing software.  This tunnelling
+allows VPN sites to share information with each other over the Internet
+without exposing any information to others.
+
+A single tinc daemon can accept more than one connection at a time, thus
+making it possible to create larger virtual networks, because some
+limitations are circumvented.
+
+Instead of most other VPN implementations, tinc encapsulates each network
+packet in its own UDP packet, instead of encapsulating all into one TCP or
+even PPP over TCP stream. This results in lower latencies, less overhead,
+and in general better responsiveness and throughput.
diff --git a/net/tinc/pkg/PLIST b/net/tinc/pkg/PLIST
new file mode 100644
index 0000000000..f3ff7a5662
--- /dev/null
+++ b/net/tinc/pkg/PLIST
@@ -0,0 +1,6 @@
+@comment $OpenBSD$
+@info info/tinc.info
+@man man/man5/tinc.conf.5
+@man man/man8/tincd.8
+@bin sbin/tincd
+@rcscript ${RCDIR}/tincd
diff --git a/net/tinc/pkg/tincd.rc b/net/tinc/pkg/tincd.rc
new file mode 100644
index 0000000000..5ccedfd226
--- /dev/null
+++ b/net/tinc/pkg/tincd.rc
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $OpenBSD:$
+
+daemon="${TRUEPREFIX}/sbin/tincd"
+
+. /etc/rc.d/rc.subr
+
+
+rc_cmd $1