diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1788a0dee0..fd3085c881 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+start-sanitize-d30v
+Thu Dec 11 09:00:15 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* configure.tgt (d30v-elf-*): Rename d30velf_e to d30v_e and
+	d30velf_o to d30v_o to work in DOS environments.
+	* Makefile.{am,in}: Ditto.
+
+	* emulparams/d30v_{o,e}: Rename from d30velf_{o,e}.
+	* emulparams/d30velf_{o,e}: Deleted.
+
+end-sanitize-d30v
 Wed Dec 10 17:40:08 1997  Nick Clifton  <nickc@cygnus.com>
 
 	* scripttempl/armcoff.sc: Add glue sections (code taken from Arm
diff --git a/ld/configure.tgt b/ld/configure.tgt
index 20fb39a7af..23e4b88081 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -15,7 +15,9 @@ arm-*-pe)		targ_emul=armpe ;;
 arc-*-elf*)		targ_emul=arcelf ;;
 d10v-*-*)		targ_emul=d10velf ;;
 # start-sanitize-d30v
-d30v-*-*)		targ_emul=d30velf ;;
+d30v-*-*ext*)		targ_emul=d30v_e; targ_extra_emuls="d30velf d30v_o" ;;
+d30v-*-*onchip*)	targ_emul=d30v_o; targ_extra_emuls="d30velf d30v_e" ;;
+d30v-*-*)		targ_emul=d30velf; targ_extra_emuls="d30v_e d30v_o" ;;
 # end-sanitize-d30v
 sparc64-*-aout*)	targ_emul=sparcaout ;;
 sparc64-*-elf*)		targ_emul=elf64_sparc ;;
diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize
index 11fa7af127..8798a08ea9 100644
--- a/ld/emulparams/.Sanitize
+++ b/ld/emulparams/.Sanitize
@@ -15,7 +15,7 @@
 
 Do-first:
 
-d30v_files="d30velf.sh d30velf_o.sh d30velf_e.sh"
+d30v_files="d30velf.sh d30v_o.sh d30v_e.sh"
 
 if ( echo $* | grep keep\-d30v > /dev/null ) ; then
 	keep_these_too="${d30v_files} ${keep_these_too}"
diff --git a/ld/emulparams/d30velf_e.sh b/ld/emulparams/d30velf_e.sh
deleted file mode 100644
index 3e6135a9fe..0000000000
--- a/ld/emulparams/d30velf_e.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-MACHINE=
-SCRIPT_NAME=elfd30v
-OUTPUT_FORMAT="elf32-d30v"
-TEXT_START_ADDR=0x00000000
-DATA_START_ADDR=0x20000000
-EMEM_START_ADDR=0x80000000
-STACK_START_ADDR=0x20008000
-TEXT_SIZE=64K
-DATA_SIZE=32K
-EMEM_SIZE=8M
-TEXT_MEMORY=emem
-DATA_MEMORY=emem
-BSS_MEMORY=emem
-ARCH=d30v
-EMBEDDED=t
diff --git a/ld/emulparams/d30velf_o.sh b/ld/emulparams/d30velf_o.sh
deleted file mode 100644
index 001fb07c82..0000000000
--- a/ld/emulparams/d30velf_o.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-MACHINE=
-SCRIPT_NAME=elfd30v
-OUTPUT_FORMAT="elf32-d30v"
-TEXT_START_ADDR=0x00000000
-DATA_START_ADDR=0x20000000
-EMEM_START_ADDR=0x80000000
-STACK_START_ADDR=0x20008000
-TEXT_SIZE=64K
-DATA_SIZE=32K
-EMEM_SIZE=8M
-TEXT_MEMORY=text
-DATA_MEMORY=data
-BSS_MEMORY=data
-ARCH=d30v
-EMBEDDED=t