diff --git a/debian/rules b/debian/rules
index bd13eb7..454ca9b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
 DEB_RELEASE=$(shell dpkg-parsechangelog -SVersion | sed 's/[^-]\+-//')
-DEB_BUILDDATE=$(shell dpkg-parsechangelog -SDate)
-DEB_BUILDUSER=$(shell dpkg-parsechangelog -SMaintainer)
-
-DEB_AUTO_UPDATE_AUTOCONF := 2.69
-DEB_AUTO_UPDATE_AUTOHEADER := 2.69
+DEB_BUILDHOST=$(shell hostname)
+DEB_BUILDDATE=$(shell date +"%F-%T")
+DEB_BUILDUSER=${USER}
 
 ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   ifneq (,$(findstring $(DEB_HOST_ARCH), i386 amd64))
@@ -27,12 +25,7 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_STORAGE_DISK   =	--with-storage-disk
   WITH_STORAGE_SHEEPDOG = --with-storage-sheepdog
   WITH_STORAGE_RBD    = --with-storage-rbd
-  WITH_UDEV           = --with-udev --without-hal
-  ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 arm64 ppc64el))
-    WITH_ZFS          = --with-storage-zfs
-  else
-    WITH_ZFS          = --without-storage-zfs
-  endif
+  WITH_UDEV           = --with-udev
   WITH_CAPNG          = --with-capng
   WITH_POLKIT         = --with-polkit
   WITH_MACVTAP        = --with-macvtap
@@ -43,12 +36,11 @@ ifneq (,$(findstring $(DEB_HOST_ARCH_OS), linux))
   WITH_SANLOCK        = --with-sanlock
   WITH_INIT_SCRIPT    =	--with-init-script=systemd
   WITH_SYSTEMD        = --with-systemd-daemon
-  WITH_FIREWALLD      = --without-firewalld
   WITH_AUDIT          = --with-audit
   WITH_SELINUX        = --without-selinux
-  WITH_APPARMOR       = --with-apparmor --with-secdriver-apparmor
+  WITH_APPARMOR       = --with-apparmor --with-secdriver-apparmor --with-apparmor-profiles
   ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 ia64 powerpc s390))
-      WITH_DTRACE     = --without-dtrace
+      WITH_DTRACE     = --with-dtrace
   else
       WITH_DTRACE     = --without-dtrace
   endif
@@ -68,7 +60,7 @@ else
   WITH_STORAGE_DISK   =	--without-storage-disk
   WITH_STORAGE_SHEEPDOG = --without-storage-sheepdog
   WITH_STORAGE_RBD    = --without-storage-rbd
-  WITH_UDEV           = --without-udev --with-hal
+  WITH_UDEV           = --without-udev
   WITH_CAPNG          = --without-capng
   WITH_POLKIT         = --without-polkit
   WITH_MACVTAP        = --without-macvtap
@@ -79,7 +71,6 @@ else
   WITH_NETCF          = --without-netcf
   WITH_INIT_SCRIPT    =	--with-init-script=none
   WITH_SYSTEMD        = --without-systemd-daemon
-  WITH_FIREWALLD      = --without-firewalld
   WITH_AUDIT          = --without-audit
   WITH_SELINUX        = --without-selinux
   WITH_APPARMOR       = --without-apparmor
@@ -90,9 +81,8 @@ else
 endif
 
 DEB_CONFIGURE_EXTRA_ARGS :=      \
-	--with-packager="$(DEB_BUILDUSER) $(DEB_BUILDDATE)" \
+	--with-packager="$(DEB_BUILDUSER) $(DEB_BUILDDATE) $(DEB_BUILDHOST)" \
 	--with-packager-version="$(DEB_RELEASE)" \
-	--with-default-editor="sensible-editor" \
 	--disable-silent-rules   \
 	--disable-rpath          \
 	$(WITH_QEMU)		 \
@@ -128,7 +118,8 @@ DEB_CONFIGURE_EXTRA_ARGS :=      \
 	$(WITH_LXC)              \
 	$(WITH_DTRACE)           \
 	$(WITH_AUDIT)            \
-	$(WITH_FIREWALLD)        \
+	--without-hal            \
+	--without-firewalld      \
 	--without-attr
 
 DEB_BUILDDIR := $(CURDIR)/debian/build