diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 028723be59f..53b84b09ce3 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-07-25  YunQiang Su  <syq@debian.org>
+
+	PR 24832
+	* elfxx-mips.c (mips_set_isa_flags): Default to MIPS 3 for 64-bit
+	mips inputs.
+
 2019-07-24  Claudiu Zissulescu  <claziss@synopsys.com>
 
 	* elf32-arc.c (bfd_get_32_me): Add a small description, fix
diff --git a/bfd/elfxx-mips.c b/bfd/elfxx-mips.c
index 29ae4559266..8e577b29e1b 100644
--- a/bfd/elfxx-mips.c
+++ b/bfd/elfxx-mips.c
@@ -12193,6 +12193,12 @@ mips_set_isa_flags (bfd *abfd)
   switch (bfd_get_mach (abfd))
     {
     default:
+      if (ABI_N32_P (abfd) || ABI_64_P (abfd))
+        val = E_MIPS_ARCH_3;
+      else
+        val = E_MIPS_ARCH_1;
+      break;
+
     case bfd_mach_mips3000:
       val = E_MIPS_ARCH_1;
       break;