diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f5dfabf9b5f..b384a8fbb92 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-10  Krister Walfridsson  <krister.walfridsson@gmail.com>
+
+	* config.gcc (i386-*-netbsd*): Make i486 the default arch on NetBSD.
+	Generally use cpu generic.
+
 2016-12-10  Jakub Jelinek  <jakub@redhat.com>
 	    Marc Glisse  <marc.glisse@inria.fr>
 
diff --git a/gcc/config.gcc b/gcc/config.gcc
index d11e5790bae..7afbc54bc78 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3061,6 +3061,12 @@ case ${target} in
     arch_without_sse2=yes
     arch_without_64bit=yes
     ;;
+  i386-*-netbsd*)
+    arch=i486
+    cpu=generic
+    arch_without_sse2=yes
+    arch_without_64bit=yes
+    ;;
   i386-*-*)
     arch=i386
     cpu=i386