diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index 7ff0f82f2..66ce1ee2d 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -98,7 +98,7 @@ class Main(object):
 
     def generate(self):
         self.log("Generate orig\n")
-        orig = os.path.join(self.dir, self.orig, 'kbuild')
+        orig = os.path.join(self.dir, self.orig)
         temp = os.path.join(self.dir, 'temp')
         os.makedirs(os.path.join(orig, 'include', 'linux'))
         for i in 'COPYING', 'Kbuild', 'Makefile':
diff --git a/Makefile b/debian/build/Makefile
similarity index 63%
rename from Makefile
rename to debian/build/Makefile
index 1ca911f3a..56a2929b9 100644
--- a/Makefile
+++ b/debian/build/Makefile
@@ -9,4 +9,4 @@ OUTDIR = .
 
 top_srcdir = .
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
diff --git a/Makefile.inc b/debian/build/Makefile.inc
similarity index 100%
rename from Makefile.inc
rename to debian/build/Makefile.inc
diff --git a/scripts/Makefile b/debian/build/scripts/Makefile
similarity index 93%
rename from scripts/Makefile
rename to debian/build/scripts/Makefile
index d74e23563..1ef6f0a1e 100644
--- a/scripts/Makefile
+++ b/debian/build/scripts/Makefile
@@ -47,4 +47,4 @@ top_srcdir = ..
 
 VPATH = $(top_srcdir)/kbuild/scripts
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
diff --git a/scripts/basic/Makefile b/debian/build/scripts/basic/Makefile
similarity index 68%
rename from scripts/basic/Makefile
rename to debian/build/scripts/basic/Makefile
index cbae6072d..3aa741d04 100644
--- a/scripts/basic/Makefile
+++ b/debian/build/scripts/basic/Makefile
@@ -7,4 +7,4 @@ top_srcdir = ../..
 
 VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
diff --git a/scripts/genksyms/Makefile b/debian/build/scripts/genksyms/Makefile
similarity index 85%
rename from scripts/genksyms/Makefile
rename to debian/build/scripts/genksyms/Makefile
index b6af7f286..2debf5b09 100644
--- a/scripts/genksyms/Makefile
+++ b/debian/build/scripts/genksyms/Makefile
@@ -6,7 +6,7 @@ top_srcdir = ../..
 
 VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 CFLAGS += -I$(VPATH)
 
diff --git a/scripts/kconfig/Makefile b/debian/build/scripts/kconfig/Makefile
similarity index 86%
rename from scripts/kconfig/Makefile
rename to debian/build/scripts/kconfig/Makefile
index 9100f3ecc..d14e845f5 100644
--- a/scripts/kconfig/Makefile
+++ b/debian/build/scripts/kconfig/Makefile
@@ -6,7 +6,7 @@ top_srcdir = ../..
 
 VPATH = $(top_srcdir)/kbuild/$(OUTDIR)
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 CFLAGS += -I$(VPATH)
 
diff --git a/scripts/mod/Makefile b/debian/build/scripts/mod/Makefile
similarity index 90%
rename from scripts/mod/Makefile
rename to debian/build/scripts/mod/Makefile
index 0e01d9fea..c413590c4 100644
--- a/scripts/mod/Makefile
+++ b/debian/build/scripts/mod/Makefile
@@ -9,7 +9,7 @@ OUTDIR = scripts/mod
 
 top_srcdir = ../..
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 modpost.real-%:
 	$(MAKE) -f Makefile.real TYPE=$* SOURCEDIR=$(top_srcdir)/kbuild/scripts/mod
diff --git a/scripts/mod/Makefile.real b/debian/build/scripts/mod/Makefile.real
similarity index 86%
rename from scripts/mod/Makefile.real
rename to debian/build/scripts/mod/Makefile.real
index be0d63c20..a0979abce 100644
--- a/scripts/mod/Makefile.real
+++ b/debian/build/scripts/mod/Makefile.real
@@ -4,7 +4,7 @@ top_srcdir = ../..
 
 CFLAGS += -I$(top_srcdir)/kbuild/include
 
-include $(top_srcdir)/Makefile.inc
+include $(top_srcdir)/debian/build/Makefile.inc
 
 modpost.real-$(TYPE): file2alias.real-$(TYPE).o modpost.real-$(TYPE).o sumversion.real-$(TYPE).o
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
diff --git a/scripts/mod/elfconfig.h b/debian/build/scripts/mod/elfconfig.h
similarity index 100%
rename from scripts/mod/elfconfig.h
rename to debian/build/scripts/mod/elfconfig.h
diff --git a/scripts/mod/gendef.py b/debian/build/scripts/mod/gendef.py
similarity index 100%
rename from scripts/mod/gendef.py
rename to debian/build/scripts/mod/gendef.py
diff --git a/scripts/mod/modpost.c b/debian/build/scripts/mod/modpost.c
similarity index 100%
rename from scripts/mod/modpost.c
rename to debian/build/scripts/mod/modpost.c
diff --git a/scripts/mod/real-lsb-32/elfconfig.h b/debian/build/scripts/mod/real-lsb-32/elfconfig.h
similarity index 100%
rename from scripts/mod/real-lsb-32/elfconfig.h
rename to debian/build/scripts/mod/real-lsb-32/elfconfig.h
diff --git a/scripts/mod/real-lsb-64/elfconfig.h b/debian/build/scripts/mod/real-lsb-64/elfconfig.h
similarity index 100%
rename from scripts/mod/real-lsb-64/elfconfig.h
rename to debian/build/scripts/mod/real-lsb-64/elfconfig.h
diff --git a/scripts/mod/real-msb-32/elfconfig.h b/debian/build/scripts/mod/real-msb-32/elfconfig.h
similarity index 100%
rename from scripts/mod/real-msb-32/elfconfig.h
rename to debian/build/scripts/mod/real-msb-32/elfconfig.h
diff --git a/scripts/mod/real-msb-64/elfconfig.h b/debian/build/scripts/mod/real-msb-64/elfconfig.h
similarity index 100%
rename from scripts/mod/real-msb-64/elfconfig.h
rename to debian/build/scripts/mod/real-msb-64/elfconfig.h
diff --git a/debian/rules b/debian/rules
index 2ca960d0a..fab307f2e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,12 +11,12 @@ VERSION_DEBIAN_BINNMU := $(shell echo "$(VERSION_DEBIAN)" | sed -ne 's,.*\+b\(.*
 include debian/rules.defs
 
 build: debian/control $(STAMPS_DIR)/build-base
-$(STAMPS_DIR)/build-base: $(BUILD_DIR) $(STAMPS_DIR) kbuild/include/generated/autoconf.h
+$(STAMPS_DIR)/build-base: $(STAMPS_DIR) kbuild/include/generated/autoconf.h
 	dh_testdir
 	$(MAKE) -f debian/rules.gen build
 	touch $@
 
-$(BUILD_DIR) $(STAMPS_DIR):
+$(STAMPS_DIR):
 	@[ -d $@ ] || mkdir $@
 
 # modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined
@@ -46,7 +46,8 @@ maintainerclean:
 
 clean: debian/control
 	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
+	make -C $(BUILD_DIR) clean top_srcdir=$(CURDIR)
+	rm -rf $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
 	dh_clean
 
 binary-indep:
diff --git a/debian/rules.real b/debian/rules.real
index 053ac80dd..996a5bab0 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -6,25 +6,19 @@ binary-arch: install-kbuild
 
 build: $(STAMPS_DIR)/build
 
-$(STAMPS_DIR)/build: SOURCE_FILES = $(filter-out debian, $(wildcard * .[^.]*))
-$(STAMPS_DIR)/build: DIR=$(BUILD_DIR)/build
 $(STAMPS_DIR)/build:
-	rm -rf '$(DIR)'
-	mkdir -p '$(DIR)'
-	cp -al $(SOURCE_FILES) '$(DIR)'
-	$(MAKE) -C $(DIR) top_srcdir=$(CURDIR)
+	$(MAKE) -C $(BUILD_DIR) top_srcdir=$(CURDIR)
 	touch '$@'
 
 install-kbuild: PACKAGE_NAME = linux-kbuild-$(VERSION)
 install-kbuild: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-kbuild: BASE_DIR = /usr/lib/$(PACKAGE_NAME)
-install-kbuild: SOURCE_DIR = $(BUILD_DIR)/build
 install-kbuild: DIR = $(CURDIR)/debian/$(PACKAGE_NAME)/$(BASE_DIR)
 install-kbuild: $(STAMPS_DIR)/build
 	dh_testdir
 	dh_testroot
 	dh_clean -k -d
-	$(MAKE) -C $(SOURCE_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
+	$(MAKE) -C $(BUILD_DIR) install prefix=$(DIR) top_srcdir=$(CURDIR)
 	dh_link $(BASE_DIR) /usr/src/$(PACKAGE_NAME)
 	dh_installchangelogs
 	dh_installdocs