diff --git a/Makefile.orig b/Makefile
index ade10bf..7de05a4 100644
--- a/Makefile.orig
+++ b/Makefile
@@ -1,6 +1,5 @@
 MAKEFLAGS=-r
-CC ?= gcc
-CFLAGS += -Werror=strict-prototypes -Werror=old-style-definition -Werror=missing-declarations -Werror=missing-prototypes
+CFLAGS += -Wno-incompatible-pointer-types -Wno-int-conversion -Wno-implicit-function-declaration
 PYTHON ?= python3
 export PYTHON CC MAKEFLAGS CFLAGS
 
@@ -26,7 +24,7 @@ all-base:
 	$(PYTHON) setup.py build
 .PHONY: all-base
 
-install-base: all-base
+install-base:
 	+$(MAKE) install -C libqrexec
 	$(PYTHON) setup.py install -O1 $(PYTHON_PREFIX_ARG) --skip-build --root $(DESTDIR)
 	ln -sf qrexec-policy-exec $(DESTDIR)/usr/bin/qrexec-policy
@@ -75,7 +73,7 @@ all-vm-selinux:
 	+$(MAKE) -f /usr/share/selinux/devel/Makefile -C selinux qubes-core-qrexec.pp
 .PHONY: all-vm
 
-install-vm: all-vm
+install-vm:
 	+$(MAKE) install -C agent
 	install -d $(DESTDIR)/$(SYSLIBDIR)/systemd/system -m 755
 	install -t $(DESTDIR)/$(SYSLIBDIR)/systemd/system -m 644 systemd/qubes-qrexec-agent.service
diff --git a/agent/Makefile.orig b/agent/Makefile
index e1500f1..d75f60e 100644
--- a/agent/Makefile.orig
+++ b/agent/Makefile
@@ -32,7 +32,7 @@ else
 endif
 
 
-install: all
+install:
 	install -d $(DESTDIR)/etc/qubes-rpc $(DESTDIR)/usr/lib/qubes \
 		$(DESTDIR)/usr/bin $(DESTDIR)/usr/share/man/man1
 	install qrexec-agent $(DESTDIR)/usr/lib/qubes