diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index f1ee271b15..21b8f017ec 100644
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -36,13 +36,6 @@ else
         lose_these_too="${beos_files} ${lose_these_too}"
 fi
 
-armelf_files="armelf.sh"
-if ( echo $* | grep keep\-armelf > /dev/null ) ; then
-	keep_these_too="${armelf_files} ${keep_these_too}"
-else
-	lose_these_too="${armelf_files} ${lose_these_too}"
-fi
-
 # All files listed between the "Things-to-keep:" line and the
 # "Do-last:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -57,6 +50,7 @@ aixppc.sh
 aixrs6.sh
 alpha.sh
 arcelf.sh
+armelf.sh
 armaoutb.sh
 armaoutl.sh
 armcoff.sh
diff --git a/ld/emulparams/armelf.sh b/ld/emulparams/armelf.sh
index 8389f4d7ee..a8b74c059c 100644
--- a/ld/emulparams/armelf.sh
+++ b/ld/emulparams/armelf.sh
@@ -1,10 +1,10 @@
-# start-sanitize-armelf
 MACHINE=
-SCRIPT_NAME=elf
+SCRIPT_NAME=elfarm
 OUTPUT_FORMAT="elf32-littlearm"
 BIG_OUTPUT_FORMAT="elf32-bigarm"
 LITTLE_OUTPUT_FORMAT="elf32-littlearm"
 TEXT_START_ADDR=0x0
+TEMPLATE_NAME=armelf
 ARCH=arm
 MACHINE=
 MAXPAGESIZE=256
@@ -14,4 +14,3 @@ EMBEDDED=yes
 # Hmmm, there's got to be a better way.  This sets the stack to the
 # top of the simulator memory (2^19 bytes).
 OTHER_RELOCATING_SECTIONS='.stack 0x80000 : { _stack = .; *(.stack) }'
-# end-sanitize-armelf