diff --git a/ChangeLog b/ChangeLog
index 8b3aaec6b..42e112856 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-31  Roger Sayle  <roger@eyesopen.com>
+
+	* configure.in (ia64*-*-hpux*): Disable building java libraries.
+	* configure: Regenerated.
+
 2003-12-21  Bernardo Innocenti  <bernie@develer.com>
  
  	* configure.in (*-*-uclinux): Exclude newlib, libgloss and rda.
diff --git a/configure b/configure
index 0c88cf501..38d9b352f 100755
--- a/configure
+++ b/configure
@@ -1265,7 +1265,7 @@ case "${target}" in
     ;;
   ia64*-**-hpux*)
     # No gdb or ld support yet.
-    noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb ld"
+    noconfigdirs="$noconfigdirs ${libgcj} tix readline mmalloc libgui itcl gdb ld"
     ;;
   i[3456789]86-*-coff | i[3456789]86-*-elf)
     noconfigdirs="$noconfigdirs ${libgcj}"
diff --git a/configure.in b/configure.in
index 256748764..d7b009ced 100644
--- a/configure.in
+++ b/configure.in
@@ -504,7 +504,7 @@ case "${target}" in
     ;;
   ia64*-**-hpux*)
     # No gdb or ld support yet.
-    noconfigdirs="$noconfigdirs tix readline mmalloc libgui itcl gdb ld"
+    noconfigdirs="$noconfigdirs ${libgcj} tix readline mmalloc libgui itcl gdb ld"
     ;;
   i[[3456789]]86-*-coff | i[[3456789]]86-*-elf)
     noconfigdirs="$noconfigdirs ${libgcj}"