diff --git a/debian/changelog b/debian/changelog
index 423296f86..47da5a1bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-kbuild-2.6 (2.6.34-1~experimental.1) UNRELEASED; urgency=low
+
+  * New upstream version
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 17 May 2010 03:26:43 +0100
+
 linux-kbuild-2.6 (2.6.32-1) unstable; urgency=low
 
   [ Ben Hutchings ]
diff --git a/debian/rules b/debian/rules
index 25d147c7d..2ca960d0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ 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)
+$(STAMPS_DIR)/build-base: $(BUILD_DIR) $(STAMPS_DIR) kbuild/include/generated/autoconf.h
 	dh_testdir
 	$(MAKE) -f debian/rules.gen build
 	touch $@
@@ -19,6 +19,12 @@ $(STAMPS_DIR)/build-base: $(BUILD_DIR) $(STAMPS_DIR)
 $(BUILD_DIR) $(STAMPS_DIR):
 	@[ -d $@ ] || mkdir $@
 
+# modpost needs CONFIG_SYMBOL_PREFIX from autoconf.h, but this is undefined
+# for all Debian architectures.
+kbuild/include/generated/autoconf.h:
+	@mkdir -p $(@D)
+	@[ -f $@ ] || touch $@
+
 DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
 TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
@@ -40,7 +46,7 @@ maintainerclean:
 
 clean: debian/control
 	dh_testdir
-	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc
+	rm -rf $(BUILD_DIR) $(STAMPS_DIR) debian/lib/python/debian_linux/*.pyc kbuild/include/generated
 	dh_clean
 
 binary-indep: