diff --git a/package/base/glibc/glibc.conf b/package/base/glibc/glibc.conf
index 2eddfe056..bed39267d 100644
--- a/package/base/glibc/glibc.conf
+++ b/package/base/glibc/glibc.conf
@@ -236,6 +236,14 @@ glibc_prepatch() {
 	if [ "$tarball" ] ; then
 		tar $taropt $archdir/$tarball
 	fi
+
+	if [ $pkg_glibc_version = 23 ] ; then
+		# add hppa patch if needed
+		if [ "$arch" = hppa ]; then
+			tar --use-compress-program=bzip2 -Oxf $archdir/glibc-hppa*.bz2 > $archdir/glibc-hppa-patches.diff
+			var_append patchfiles " " "$archdir/glibc-hppa-patches.diff"
+		fi
+	fi
 }
 
 glibc_stage0() {
diff --git a/package/base/glibc/glibc.desc b/package/base/glibc/glibc.desc
index 9ba40b150..7cabc3bfe 100644
--- a/package/base/glibc/glibc.desc
+++ b/package/base/glibc/glibc.desc
@@ -53,5 +53,6 @@
 #[D] 305952084 glibc-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
 #[D] 4056606041 glibc-linuxthreads-2.3.2.tar.bz2 ftp://sources.redhat.com/pub/glibc/releases/
 [D] X glibc-2.3.4-2004-05-01.tar.bz2 cvs://pserver:anoncvs@sources.redhat.com:/cvs/glibc::libc/!2004-05-01/
+[D] 3614008728 glibc-hppa-patches-2004-05-01.tar.gz http://parisc-linux.org/~carlos/glibc-work/
 #endif
 
diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf
index f6b1c5fb4..db905addb 100644
--- a/package/base/linux/linux.conf
+++ b/package/base/linux/linux.conf
@@ -87,6 +87,11 @@ for x in $confdir/linux$treever/*.patch; do
 	var_append patchfiles " " "$x"
 done
 
+# add hppa patch if needed
+if [[ "$arch" == hppa && "$vanillaver" == 2.6* ]]; then
+	var_insert patchfiles " " "$archdir/patch-2.6.*-pa*.bz2"
+fi
+
 auto_config ()
 {
 	if [ -f $base/architecture/$arch/kernel$treever.conf.sh ] ; then
diff --git a/package/base/linux/linux.desc b/package/base/linux/linux.desc
index aab499061..82dba51f2 100644
--- a/package/base/linux/linux.desc
+++ b/package/base/linux/linux.desc
@@ -51,5 +51,6 @@
 #if xpkg == linux26.*
 [V] 2.6.7
 [D] 2651578800 linux-2.6.7.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/
+[D] 2989845998 patch-2.6.7-pa15.gz http://cvs.parisc-linux.org/download/linux-2.6/
 #endif