diff --git a/Makefile.builder b/Makefile.builder
index 294d740..3c3b8e4 100644
--- a/Makefile.builder
+++ b/Makefile.builder
@@ -15,6 +15,9 @@ source-debian-quilt-copy-in:
 	if [ $(DIST) == trusty ] ; then \
 		sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi
+	if [ $(DIST) == zesty ] ; then \
+		sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
+	fi
 	-$(shell $(ORIG_SRC)/debian-quilt $(ORIG_SRC)/series-debian-vm.conf $(CHROOT_DIR)/$(DIST_SRC)/debian/patches)
 	tar cfz $(ORIG_FILE) --exclude-vcs --exclude=rpm --exclude=pkgs --exclude=deb --exclude=debian -C $(CHROOT_DIR)/$(DIST_SRC) .
 
diff --git a/debian/control b/debian/control
index 56d7a12..18545c4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: qubes-core-agent
 Section: admin
 Priority: extra
-Maintainer: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
+Maintainer: unman <unman@thirdeyesecurity.org>
 Build-Depends:
     libqrexec-utils-dev,
     libqubes-rpc-filecopy-dev (>= 3.1.3),