diff --git a/src/template/.similar b/src/template/.similar
index 91db8e4688..22814b005a 100644
--- a/src/template/.similar
+++ b/src/template/.similar
@@ -1,26 +1,25 @@
 alpha-dec-osf=alpha
-alpha-unknown-linux-gnu=linuxalpha
+alpha-unknown-linux-gnu=linux_alpha
 hppa1.1-stratus-sysv4=svr4
-hppa1.1-hp-hpux10.20=hpux
-i386-pc-bsdi2.0=bsdi-2.0
-i386-pc-bsdi2.1=bsdi-2.1
-i386-pc-bsdi3.0=bsdi-3.0
-i386-pc-linux-gnu=linux-elf
-i386-pc-solaris2.6=i386_solaris-gcc
-i386-pc-sunos5=i386_solaris-gcc
+hppa1.1-hp-hpux10.20=hpux_cc
+i386-pc-bsdi2.0=bsdi_2.0
+i386-pc-bsdi2.1=bsdi_2.1
+i386-pc-bsdi3.0=bsdi_3.0
+i386-pc-linux-gnu=linux_i386
+i386-pc-solaris2.6=solaris_i386_gcc
+i386-pc-sunos5=solaris_i386_gcc
 i386-unknown-freebsd=freebsd
 i386-unknown-netbsd=netbsd
-i486-pc-linux-gnu=linux-elf
-i486-pc-linux-gnuaout=linux
-i586-pc-linux-gnu=linux-elf
+i486-pc-linux-gnu=linux_i386
+i586-pc-linux-gnu=linux_i386
 i586-pc-sco3.2v=sco
-i686-pc-linux-gnu=linux-elf
+i686-pc-linux-gnu=linux_i386
 mips-sgi-irix=irix5
 powerpc-ibm-aix3.2.5=aix_325
 powerpc-ibm-aix4.1.4.0=aix_41
 powerpc-ibm-aix4.1.5.0=aix_41
-powerpc-unknown-linux-gnu=linux-elf
-sparc-sun-solaris=sparc_solaris-gcc
-sparc-sun-sunos5=sparc_solaris-gcc
-sparc-unknown-linux-gnu=linux-elf-sparc
-sparc-sun-sunos4=sunos4-gcc
+powerpc-unknown-linux-gnu=linux_ppc
+sparc-sun-solaris=solaris_sparc_gcc
+sparc-sun-sunos5=solaris_sparc_gcc
+sparc-unknown-linux-gnu=linux_sparc
+sparc-sun-sunos4=sunos4_gcc