diff --git a/Makefile.am b/Makefile.am
index 6a4f55a4..85a37975 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc gui systemd
+SUBDIRS =  src doc gui test systemd
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 40c1e0e7..00000000
--- a/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-tinc (1.1-1) jessie; urgency=low
-
-  * Initial release
-
- -- jedi <pkg@j3d1.de>  Mon, 23 May 2016 19:20:41 +0200
-
diff --git a/debian/control b/debian/control
deleted file mode 100644
index fcab4359..00000000
--- a/debian/control
+++ /dev/null
@@ -1,16 +0,0 @@
-Source: tinc
-Section: net
-Priority: optional
-Maintainer: jedi <pkg@j3d1.de>
-Build-Depends: debhelper-compat (= 13), texinfo, zlib1g-dev, liblzo2-dev, libncurses-dev, libreadline-dev, libssl-dev, libcmocka-dev
-Standards-Version: 4.5.1
-Homepage: http://www.tinc-vpn.org/
-
-Package: tinc
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Virtual Private Network daemon
- tinc is a daemon with which you can create a virtual private network
- (VPN). One daemon can handle multiple connections, so you can
- create an entire (moderately sized) VPN with only one daemon per
- participating computer.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index 09fa649f..00000000
--- a/debian/copyright
+++ /dev/null
@@ -1,34 +0,0 @@
-This package was debianized by Ivo Timmermans <ivo@debian.org> on
-Fri, 21 Apr 2000 17:07:50 +0200.
-
-It was downloaded from http://www.tinc-vpn.org/
-
-Upstream Authors:
- Guus Sliepen <guus@tinc-vpn.org>
- Ivo Timmermans <ivo@tinc-vpn.org>
-
-Copyright (C) 1998-2005 Ivo Timmermans
-              1998-2008 Guus Sliepen <guus@tinc-vpn.org>
-
-    This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
-On Debian GNU/Linux systems, the complete text of the GNU General Public
-License version 2 can be found in /usr/share/common-licenses/GPL-2.
-
-The following applies to tinc:
-
-This program is released under the GPL with the additional exemption
-that compiling, linking, and/or using OpenSSL is allowed.  You may
-provide binary packages linked to the OpenSSL libraries, provided that
-all other requirements of the GPL are met.
-
-The following applies to the LZO library:
-
-Hereby I grant a special exception to the tinc VPN project
-(http://tinc.nl.linux.org/) to link the LZO library with the OpenSSL library
-(http://www.openssl.org).
-
-Markus F.X.J. Oberhumer
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 1eae2e2d..00000000
--- a/debian/dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/sbin
-usr/share
-etc
-etc/init.d
-usr/share/locale
-usr/share/doc/tinc
-etc/tinc
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index c6769fa5..00000000
--- a/debian/postinst
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-NETSFILE="/etc/tinc/nets.boot"
-
-set -e
-
-case "$1" in
-    configure)
-	if [ ! -e /dev/.devfsd ] ; then if [ ! -e /dev/.devfs ] ; then
-		if [ ! -e /dev/net/tun ] ; then if [ ! -e /dev/tun ] ; then if [ -e /dev/MAKEDEV ]; then
-			echo "Creating tun device..."
-			cd /dev && ./MAKEDEV net/tun 2>/dev/null || ./MAKEDEV tun 2>/dev/null || echo "Failed to create tun device."
-		fi; fi; fi
-	fi; fi
-
-	if [ ! -e $NETSFILE ] ; then
-	    echo "## This file contains all names of the networks to be started on system startup." > $NETSFILE
-	fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-esac
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 91c23720..00000000
--- a/debian/rules
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-%:
-	dh $@
-
-#override_dh_auto_configure:
-#	dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system
-
-#override_dh_auto_install:
-#	dh_auto_install -- install-html
-#	# Remove info dir file
-#	rm -f debian/tinc/usr/share/info/dir
-
-#override_dh_installinit:
-#	dh_installinit -R
-
-#override_dh_systemd_start:
-#	dh_systemd_start --restart-after-upgrade
diff --git a/debian/source/format b/debian/source/format
deleted file mode 100644
index 163aaf8d..00000000
--- a/debian/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (quilt)