diff --git a/Makefile b/Makefile
index 6a6aadf..5a19bca 100644
--- a/Makefile
+++ b/Makefile
@@ -302,6 +302,8 @@ endif
 
 ifeq ($(shell lsb_release -is), Debian)
 	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
+else ifeq ($(shell lsb_release -is), Ubuntu)
+	install -m 0644 misc/qubesxdg.py $(DESTDIR)/$(PYTHON2_SITELIB)/
 else
 	install -m 0644 misc/py2/qubesxdg.py* $(DESTDIR)/$(PYTHON2_SITELIB)/
 endif
diff --git a/Makefile.builder b/Makefile.builder
index 3c3b8e4..80e9e0e 100644
--- a/Makefile.builder
+++ b/Makefile.builder
@@ -15,6 +15,11 @@ source-debian-quilt-copy-in:
 	if [ $(DIST) == trusty ] ; then \
 		sed -i /locales-all/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi
+	if [ $(DIST) == xenial ] ; then \
+		sed -i /avahi-daemon.service.d/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
+		sed -i /exim4/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
+		sed -i /netfilter-persistent/d $(CHROOT_DIR)/$(DIST_SRC)/debian/qubes-core-agent.install;\
+	fi
 	if [ $(DIST) == zesty ] ; then \
 		sed -i /initscripts/d $(CHROOT_DIR)/$(DIST_SRC)/debian/control ;\
 	fi