diff --git a/gas/ChangeLog b/gas/ChangeLog
index 5cf81750c2..6ae757f023 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-28  Alan Modra  <alan@linuxcare.com.au>
+
+	* config/tc-hppa.c (DEFAULT_LEVEL): Define.
+	(md_begin): Use it when setting default architecture.
+
 2001-03-27  Nick Papadonis  <nick@coelacanth.com>
 
 	* read.c (equals): (for COFF) default symbols to being local.
@@ -83,7 +88,7 @@
 	(TC_RELOC_RTSYM_LOC_FIXUP): Define.
 	(tc_fix_adjustable): Don't adjust a globally visible symbol when
 	generating ELF.
-	(tc_frob_symbol): Avoid emitting undefined symbols. 
+	(tc_frob_symbol): Avoid emitting undefined symbols.
 
 2001-03-20  Alan Modra  <alan@linuxcare.com.au>
 
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index a293b9e75b..fe877cbd65 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -105,6 +105,12 @@ typedef som_symbol_type obj_symbol_type;
 #endif
 #endif /* OBJ_SOM */
 
+#if TARGET_ARCH_SIZE == 64
+#define DEFAULT_LEVEL 25
+#else
+#define DEFAULT_LEVEL 10
+#endif
+
 /* Various structures and types used internally in tc-hppa.c.  */
 
 /* Unwind table and descriptor.  FIXME: Sync this with GDB version.  */
@@ -1393,7 +1399,7 @@ md_begin ()
   call_info_root = NULL;
 
   /* Set the default machine type.  */
-  if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, 10))
+  if (!bfd_set_arch_mach (stdoutput, bfd_arch_hppa, DEFAULT_LEVEL))
     as_warn (_("could not set architecture and machine"));
 
   /* Folding of text and data segments fails miserably on the PA.