diff --git a/debian/changelog b/debian/changelog
index 4087f25a0..427c8d186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (4.5~rc5-1~exp2) experimental; urgency=medium
+
+  * Merge build fix from unstable
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 21 Feb 2016 17:40:52 +0000
+
 linux-tools (4.5~rc5-1~exp1) experimental; urgency=medium
 
   * New upstream release candidate
@@ -9,6 +15,12 @@ linux-tools (4.5~rc5-1~exp1) experimental; urgency=medium
 
  -- Ben Hutchings <ben@decadent.org.uk>  Sun, 21 Feb 2016 16:45:52 +0000
 
+linux-tools (4.4-4) unstable; urgency=medium
+
+  * hyperv-daemons: Only build the progarams on x86 (fixes FTBFS)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 21 Feb 2016 16:57:55 +0000
+
 linux-tools (4.4-3) unstable; urgency=medium
 
   * hyperv-daemons: Add init scripts
diff --git a/debian/rules.d/tools/hv/Makefile b/debian/rules.d/tools/hv/Makefile
index 06a50a4f7..393d64007 100644
--- a/debian/rules.d/tools/hv/Makefile
+++ b/debian/rules.d/tools/hv/Makefile
@@ -1,3 +1,10 @@
+ifeq ($(filter i386 amd64 x32,$(DEB_BUILD_ARCH)),)
+
+# Build nothing
+include ../../Makefile.inc
+
+else
+
 PROGS = \
 	hv_fcopy_daemon \
 	hv_kvp_daemon \
@@ -14,3 +21,5 @@ install-local-progs: $(PROGS)
 	  install -D -m755 "$$p" "$(DESTDIR)/$(prefix)/$$(basename $$p)"; \
 	done
 	install -D -m755 check-hyperv '$(DESTDIR)/lib/hyperv-daemons/check-hyperv'
+
+endif