diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index ddb29f21d..97183eb4d 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -152,8 +152,10 @@ class Main(object):
             'COPYING',
             'Kbuild',
             'Makefile',
+            'arch/*/include/asm/Kbuild',	# may select generic uapi headers
             'arch/*/include/uapi/',
             'arch/*/Makefile',
+            'arch/arm/include/asm/types.h',	# belongs in uapi
             'arch/mips/Kbuild.platforms',
             'arch/mips/*/Platform',
             'arch/x86/entry/syscalls/',
diff --git a/debian/changelog b/debian/changelog
index 729b406b2..ec1cfb62d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ linux-tools (4.3.1-1) UNRELEASED; urgency=medium
   * New upstream stable update
     - [x86] Add #AC to SVM_EXIT_REASONS
 
+  [ Ben Hutchings ]
+  * debian/bin/genorig.py: Add more files under arch/*/include/asm to file list
+    (fixes FTBFS on several architectures)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 14 Dec 2015 00:13:52 +0000
 
 linux-tools (4.3-1) unstable; urgency=medium