diff --git a/debian/control b/debian/control
index 28dc1e97..d251798b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: tvheadend
-Section: main
+Section: video
 Priority: extra
 Maintainer: Andreas Öman <andreas@lonelycoder.com>
-Build-Depends: debhelper (>= 7.0.50)
+Build-Depends: debhelper (>= 7.0.50), pkg-config, libavahi-client-dev, libssl-dev
 Standards-Version: 3.7.3
 
 Package: tvheadend
diff --git a/debian/rules b/debian/rules
index 76591cd5..2bae8172 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,10 +25,14 @@ override_dh_auto_build:
 	$(MAKE)
 
 override_dh_install:
-	$(MAKE) prefix=$(CURDIR)/debian/tvheadend/usr install
+	$(MAKE) DESTDIR=$(CURDIR)/debian/tvheadend install
 
 override_dh_installinit:
 	dh_installinit --name tvheadend	
 
 override_dh_strip:
-        dh_strip --dbg-package=tvheadend-dbg
+	dh_strip --dbg-package=tvheadend-dbg
+
+override_dh_autotest:
+	echo "skipped autotest"
+
diff --git a/support/posix.mk b/support/posix.mk
index 995afc9f..fae47107 100644
--- a/support/posix.mk
+++ b/support/posix.mk
@@ -1,23 +1,21 @@
 
 INSTBIN=  ${DESTDIR}${INSTALLPREFIX}/bin
 INSTMAN=  ${DESTDIR}${INSTALLPREFIX}/share/man1
-INSTDBG=  ${DESTDIR}/usr/lib/debug/${INSTALLPREFIX}/bin
+INSTDBG=  ${DESTDIR}${INSTALLPREFIX}/lib/debug/bin
 MAN=man/tvheadend.1
 
 install: ${PROG} ${MAN}
 	mkdir -p ${INSTBIN}
-	mkdir -p ${INSTDBG}
 	install -T ${PROG} ${INSTBIN}/tvheadend
-
-	objcopy --only-keep-debug ${INSTBIN}/tvheadend ${INSTDBG}/tvheadend.debug
-	strip -g ${INSTBIN}/tvheadend
-
-	objcopy --add-gnu-debuglink=${INSTDBG}/tvheadend.debug ${INSTBIN}/tvheadend
-
-
 	mkdir -p ${INSTMAN}
 	install ${MAN} ${INSTMAN}
 
+install-debug: ${PROG}
+	mkdir -p ${INSTDBG}
+	objcopy --only-keep-debug ${INSTBIN}/tvheadend ${INSTDBG}/tvheadend.debug
+	strip -g ${INSTBIN}/tvheadend
+	objcopy --add-gnu-debuglink=${INSTDBG}/tvheadend.debug ${INSTBIN}/tvheadend
+
 uninstall:
 	rm -f ${INSTBIN}/tvheadend
 	rm -f ${INSTDBG}/tvheadend.debug