diff --git a/ChangeLog b/ChangeLog
index be4491a225d..c6c8ad2104a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-13  Steve Ellcey  <sje@cup.hp.com>
+
+	* configure: Regenerate after change to elf.m4.
+
 2010-04-06  Iain Sandoe  <iains@gcc.gnu.org>
 
 	* MAINTAINERS (Write After Approval): Add myself.
diff --git a/config/ChangeLog b/config/ChangeLog
index 40921047283..e0ce47425a3 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-13  Steve Ellcey  <sje@cup.hp.com>
+
+	* elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms.
+
 2010-03-23  Kai Tietz  <kai.tietz@onevision.com>
 
 	* mh-mingw: Revert accidentally checking r156315.
diff --git a/config/elf.m4 b/config/elf.m4
index 44d02498f24..007006eaea2 100644
--- a/config/elf.m4
+++ b/config/elf.m4
@@ -15,7 +15,7 @@ target_elf=no
 case $target in
   *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
   *-msdosdjgpp* | *-netware* | *-vms* | *-wince* | *-*-pe* | \
-  alpha*-dec-osf* | *-interix*)
+  alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux*)
     target_elf=no
     ;;
   *)
diff --git a/configure b/configure
index 02272032e70..c069f93842c 100755
--- a/configure
+++ b/configure
@@ -6002,7 +6002,7 @@ target_elf=no
 case $target in
   *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
   *-msdosdjgpp* | *-netware* | *-vms* | *-wince* | *-*-pe* | \
-  alpha*-dec-osf* | *-interix*)
+  alpha*-dec-osf* | *-interix* | hppa[12]*-*-hpux*)
     target_elf=no
     ;;
   *)