diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cd4b054036..897eb2bcb7 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-24  Randolph Chung  <tausq@debian.org>
+
+	* hppa-tdep.c: Fix handling of 8-byte structures; they should not 
+	be "small_struct".
+
 2004-05-24  Mark Kettenis  <kettenis@gnu.org>
 
 	* m68kbsd-nat.c (m68kbsd_collect_gregset): Specify correct
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 4adefeda26..52176ee68f 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -790,7 +790,7 @@ hppa32_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr,
 	         the higher-ordered word is stored in the lower-ordered
 		 argument, and even though it is a 8-byte quantity the
 		 registers need not be 8-byte aligned.  */
-	      if (param_len > 4)
+	      if (param_len > 4 && param_len < 8)
 		small_struct = 1;
 	    }