diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index a0aa2a83e..b52550577 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,11 @@
+Wed Aug 29 14:17:38 2001  J"orn Rennecke <amylaar@redhat.com>
+
+	* configure.host (h8300-*-elf*, h8500-*-elf*): New cases.
+	* libc/sys/h8300hms/crt1.c (__main): Don't reference __ctors /
+	__ctors_end.
+	* libc/sys/h8300hms/syscalls.c: Include errno.h.
+	(_unlink): New stub function.
+
 Sat Aug 25 22:22:25 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* libc/include/sys/errno.h: Add a cautionary comment.
diff --git a/newlib/configure.host b/newlib/configure.host
index ca5eec65c..0b8b0c022 100644
--- a/newlib/configure.host
+++ b/newlib/configure.host
@@ -230,12 +230,18 @@ case "${host}" in
   h8300-*-hms*)
 	sys_dir=h8300hms
 	;;
+  h8300-*-elf*)
+	sys_dir=h8300hms
+	;;
   h8300-*-xray*)
 	sys_dir=h8300xray
 	;;
   h8500-*-hms*)
 	sys_dir=h8500hms
 	;;
+  h8500-*-elf*)
+	sys_dir=h8500hms
+	;;
   i[3456]86-*-go32)
 	sys_dir=go32
 	;;
diff --git a/newlib/libc/sys/h8300hms/crt1.c b/newlib/libc/sys/h8300hms/crt1.c
index dd0be3145..bd4ccf2d8 100644
--- a/newlib/libc/sys/h8300hms/crt1.c
+++ b/newlib/libc/sys/h8300hms/crt1.c
@@ -1,5 +1,6 @@
 void __main ()
 {
+#ifndef __ELF__
   static int initialized;
   if (! initialized)
     {
@@ -13,4 +14,5 @@ void __main ()
 	(*--p) ();
 
     }
+#endif
 }
diff --git a/newlib/libc/sys/h8300hms/syscalls.c b/newlib/libc/sys/h8300hms/syscalls.c
index b7a90e316..9f89c55d5 100644
--- a/newlib/libc/sys/h8300hms/syscalls.c
+++ b/newlib/libc/sys/h8300hms/syscalls.c
@@ -3,6 +3,7 @@
 #include <_ansi.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <errno.h>
 
 int _DEFUN(_read,(file, ptr, len),
 	   int file _AND
@@ -48,3 +49,11 @@ _open (path, flags)
 {
   return 0;
 }
+
+int
+_unlink (path)
+     const char *path;
+{
+  errno = EIO;
+  return -1;
+}