diff --git a/Makefile.am b/Makefile.am
index 85a37975..6a4f55a4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS =  src doc gui test systemd
+SUBDIRS =  src doc gui systemd
 
 ACLOCAL_AMFLAGS = -I m4
 
diff --git a/debian/changelog b/debian/changelog
index 5a6af509..40c1e0e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,5 +2,5 @@ tinc (1.1-1) jessie; urgency=low
 
   * Initial release
 
- -- jedi <tinc@j3d1.de>  Mon, 23 May 2016 19:20:41 +0200
+ -- jedi <pkg@j3d1.de>  Mon, 23 May 2016 19:20:41 +0200
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28b..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 204178d9..fcab4359 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,9 @@
 Source: tinc
 Section: net
 Priority: optional
-Maintainer: jedi <tinc@j3d1.de>
-Standards-Version: 3.9.8
-Build-Depends: libssl-dev, debhelper (>= 10), gettext, texinfo, zlib1g-dev, liblzo2-dev, libvdeplug-dev,  libncurses5-dev, libreadline-dev, libssl-dev, dh-systemd
+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
diff --git a/debian/tinc.dirs b/debian/dirs
similarity index 100%
rename from debian/tinc.dirs
rename to debian/dirs
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e69de29b..00000000
diff --git a/debian/rules b/debian/rules
index d58ec931..91c23720 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,16 +6,16 @@
 %:
 	dh $@
 
-override_dh_auto_configure:
-	dh_auto_configure -- --enable-uml --enable-vde --with-systemdsystemunitdir=/lib/systemd/system
+#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_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_installinit:
+#	dh_installinit -R
 
-override_dh_systemd_start:
-	dh_systemd_start --restart-after-upgrade
+#override_dh_systemd_start:
+#	dh_systemd_start --restart-after-upgrade
diff --git a/debian/tinc.default b/debian/tinc.default
deleted file mode 100644
index bca24321..00000000
--- a/debian/tinc.default
+++ /dev/null
@@ -1,7 +0,0 @@
-# Extra options to be passed to tincd.
-# EXTRA="-d"
-
-# Limits to be configured for the tincd process. Please read your shell
-# (pointed by /bin/sh) documentation for ulimit. You probably want to raise the
-# max locked memory value if using both --mlock and --user flags.
-# LIMITS="-l 1024"
diff --git a/debian/tinc.files b/debian/tinc.files
deleted file mode 100644
index ed7bd233..00000000
--- a/debian/tinc.files
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/sbin/tincd
-usr/sbin/tinc
-usr/share/man
-etc
-usr/share/doc/tinc
-usr/share/locale
-usr/share/info