diff --git a/debian/arch/hppa/defines b/debian/arch/hppa/defines
index 676af9898..5ef9b2939 100644
--- a/debian/arch/hppa/defines
+++ b/debian/arch/hppa/defines
@@ -18,9 +18,11 @@ class: multiprocessor 32-bit PA-RISC
 
 [parisc64]
 class: 64-bit PA-RISC
+override-host-type: hppa64-linux-gnu
 
 [parisc64-smp]
 class: multiprocessor 64-bit PA-RISC
+override-host-type: hppa64-linux-gnu
 
 [relations]
 gcc-4.1: gcc-4.1, binutils-hppa64, gcc-4.1-hppa64
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index baa156568..7bb002bd2 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -91,6 +91,7 @@ class gencontrol(debian_linux.gencontrol.gencontrol):
             ('kpkg-arch', 'KPKG_ARCH'),
             ('kpkg-subarch', 'KPKG_SUBARCH'),
             ('localversion', 'LOCALVERSION'),
+            ('override-host-type', 'OVERRIDE_HOST_TYPE'),
             ('type', 'TYPE'),
         ):
             if vars.has_key(i[0]):
diff --git a/debian/changelog b/debian/changelog
index 80d6f647b..7624e236b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ linux-2.6 (2.6.18-9) UNRELEASED; urgency=low
   * Update vserver patch to 2.0.2.2-rc9. (closes: #402743)
   * Update xen patch to changeset 36186 from Fedora 2.6.18 branch.
   * i386/xen: Build only the pae version. (closes: #390862)
+  * hppa: Override host type when necessary.
 
   [ dann frazier ]
   * Fix potential fragmentation attacks in ip6_tables (CVE-2006-4572)
@@ -144,7 +145,7 @@ linux-2.6 (2.6.18-9) UNRELEASED; urgency=low
     memory accesses in ehci-hub-control() by adding an alignment attribute
     to the tbuf array declaration. Thanks to David Miller for the patch.
 
- -- maximilian attems <maks@sternwelten.at>  Fri,  5 Jan 2007 00:46:22 +0100
+ -- Bastian Blank <waldi@debian.org>  Sat,  6 Jan 2007 21:58:08 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 
diff --git a/debian/rules.real b/debian/rules.real
index 5b8b12843..4004ea319 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -117,6 +117,18 @@ $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): SOURCE_DIR=$(BUILD_DI
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): DIR=$(BUILD_DIR)/build-$(ARCH)-$(SUBARCH)-$(FLAVOUR)
 $(STAMPS_DIR)/setup-$(ARCH)-$(SUBARCH)-$(FLAVOUR)-$(TYPE): $(BUILD_DIR)/config.$(ARCH)-$(SUBARCH)-$(FLAVOUR) $(STAMPS_DIR)/source-$(ARCH)-$(SUBARCH)
 
+ifdef OVERRIDE_HOST_TYPE
+define SETUP_DIR_HOST_TYPE
+	echo 'override CROSS_COMPILE = $(OVERRIDE_HOST_TYPE)-' >> '$(DIR)/.kernelvariables'
+endef
+else
+define SETUP_DIR_HOST_TYPE
+	echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >> '$(DIR)/.kernelvariables'
+	echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
+	echo 'endif' >> '$(DIR)/.kernelvariables'
+endef
+endif
+
 define SETUP_DIR
 	rm -rf '$(DIR)'
 	cp -al '$(SOURCE_DIR)' '$(DIR)'
@@ -125,9 +137,7 @@ define SETUP_DIR
 	echo 'override ARCH = $(KERNEL_ARCH)' >> '$(DIR)/.kernelvariables'
 	echo 'CCACHE = ccache' >> '$(DIR)/.kernelvariables'
 	echo 'CC = $$(if $$(DEBIAN_KERNEL_USE_CCACHE),$$(CCACHE)) $$(CROSS_COMPILE)$(COMPILER)' >> '$(DIR)/.kernelvariables'
-	echo 'ifneq ($$(DEB_BUILD_ARCH),$$(DEB_HOST_ARCH))' >> '$(DIR)/.kernelvariables'
-	echo 'override CROSS_COMPILE = $$(DEB_HOST_GNU_TYPE)-' >> '$(DIR)/.kernelvariables'
-	echo 'endif' >> '$(DIR)/.kernelvariables'
+	$(SETUP_DIR_HOST_TYPE)
 	cd '$(DIR)'; $(setup_env) make reportoldconfig
 endef