diff --git a/debian/changelog b/debian/changelog
index a50e9e882a3e..240c065f4035 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux (5.3~rc2-1~exp1) UNRELEASED; urgency=medium
   * aufs: Update support patchset to aufs5.x-rcN 20190805
   * [rt] Disable until it is updated for 5.3 or later
   * [powerpcspe] Remove all support for powerpcspe, which is dead upstream
+  * linux-headers: Change per-flavour Makefile to match upstream out-of-tree
+    builds
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 05 Aug 2019 12:40:36 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 206c985d320c..4588c6b601aa 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -339,21 +339,7 @@ install-headers_$(ARCH)_$(FEATURESET)_$(FLAVOUR): $(STAMPS_DIR)/build_$(ARCH)_$(
 		cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/lib/crtsavres.o $(DIR)/arch/$(KERNEL_ARCH)/lib; \
 	fi
 
-	@echo 'VERSION = 2' > $(DIR)/Makefile
-	@echo 'PATCHLEVEL = 6' >> $(DIR)/Makefile
-
-	@echo 'MAKEARGS := -C $(BASE_DIR_COMMON) O=$(BASE_DIR)' >> $(DIR)/Makefile
-	@echo 'MAKEFLAGS += --no-print-directory' >> $(DIR)/Makefile
-
-	@echo '.PHONY: all $$(MAKECMDGOALS)' >> $(DIR)/Makefile
-	@echo 'cmd := $$(filter-out all Makefile,$$(MAKECMDGOALS))' >> $(DIR)/Makefile
-	@echo 'all:' >> $(DIR)/Makefile
-	@echo '	@$$(MAKE) $$(MAKEARGS) $$(cmd)' >> $(DIR)/Makefile
-	@echo 'Makefile:;' >> $(DIR)/Makefile
-	@echo '$$(cmd): all' >> $(DIR)/Makefile
-	@echo '	@:' >> $(DIR)/Makefile
-	@echo '%/: all' >> $(DIR)/Makefile
-	@echo '	@:' >> $(DIR)/Makefile
+	@echo 'include $(BASE_DIR_COMMON)/Makefile' >> $(DIR)/Makefile
 
 	dh_link /usr/lib/$(PACKAGE_NAME_KBUILD)/scripts $(BASE_DIR)/scripts
 	dh_link /usr/lib/$(PACKAGE_NAME_KBUILD)/tools $(BASE_DIR)/tools