diff --git a/debian/changelog b/debian/changelog
index e83175beb..70900b00c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,7 +36,10 @@ linux-2.6 (2.6.18-3) UNRELEASED; urgency=low
   * [powerpc] Added AMD74xx driver module to the powerpc64 flavour
     (Closes: #391861).
 
- -- Bastian Blank <waldi@debian.org>  Thu, 12 Oct 2006 00:06:53 +0200
+  [ Kyle McMartin ]
+  * [hppa] Force CROSS_COMPILE=hppa64-linux-gnu- (closes: #389296) 
+
+ -- Kyle McMartin <kyle@debian.org>  Thu, 12 Oct 2006 15:30:52 -0400
 
 linux-2.6 (2.6.18-2) unstable; urgency=low
 
diff --git a/debian/patches/hppa-fix-cross-compile.patch b/debian/patches/hppa-fix-cross-compile.patch
new file mode 100644
index 000000000..64d44cb88
--- /dev/null
+++ b/debian/patches/hppa-fix-cross-compile.patch
@@ -0,0 +1,12 @@
+--- a/arch/parisc/Makefile.orig	2006-10-12 16:44:54.000000000 +0000
++++ b/arch/parisc/Makefile	2006-10-12 16:45:21.000000000 +0000
+@@ -20,8 +20,7 @@
+ CHECKFLAGS	+= -D__hppa__=1
+ 
+ ifdef CONFIG_64BIT
+-CROSS_COMPILE	:= $(shell if [ -x /usr/bin/hppa64-linux-gnu-gcc ]; then \
+-			echo hppa64-linux-gnu-; else echo hppa64-linux-; fi)
++CROSS_COMPILE	:= hppa64-linux-gnu-
+ UTS_MACHINE	:= parisc64
+ CHECKFLAGS	+= -D__LP64__=1 -m64
+ else
diff --git a/debian/patches/series/3-extra b/debian/patches/series/3-extra
index 527763481..92bbb9616 100644
--- a/debian/patches/series/3-extra
+++ b/debian/patches/series/3-extra
@@ -1 +1,2 @@
 + features/all/vserver/bindmount-dev.patch *_vserver *_xen-vserver
++ hppa-fix-cross-compile.patch hppa