diff --git a/startup/EpicsHostArch b/startup/EpicsHostArch
index 455345f45..94e2a310f 100755
--- a/startup/EpicsHostArch
+++ b/startup/EpicsHostArch
@@ -9,7 +9,7 @@ case $sysname in
     Linux )
         os=linux
 		cpu=`uname -m`
-        case $cpu in i386 | i486 | i586 )
+        case $cpu in i386 | i486 | i586 | i686 )
             cpu=x86
 			;;
 		esac
diff --git a/startup/EpicsHostArch.pl b/startup/EpicsHostArch.pl
index 6dd043c73..2779a2a53 100755
--- a/startup/EpicsHostArch.pl
+++ b/startup/EpicsHostArch.pl
@@ -15,8 +15,7 @@ sub GetEpicsHostArch { # no args
     if ($arch =~ /sun4-solaris/)       { return "solaris-sparc";
     } elsif ($arch =~ m/i86pc-solaris/) { return "solaris-x86";
     } elsif ($arch =~ m/sun4-sunos/)    { return "sun4-68k";
-    } elsif ($arch =~ m/i386-linux/)    { return "linux-x86";
-    } elsif ($arch =~ m/i586-linux/)    { return "linux-x86";
+    } elsif ($arch =~ m/i[3-6]86-linux/)    { return "linux-x86";
     } elsif ($arch =~ m/MSWin32-x86/)   { return "win32-x86";
     } elsif ($arch =~ m/PA-RISC1.1/)    { return "hpux-parisc";
     } else { return "unsupported"; }