diff --git a/ld/ChangeLog b/ld/ChangeLog
index 3af8c71d65..9e4e259343 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-24  Mark Kettenis  <kettenis@gnu.org>
+
+	* configure.host: Add *-*-openbsd support.
+
 2005-04-15  Julian Brown  <julian@codesourcery.com>
 
 	* ld.texinfo: Document --use-blx.
diff --git a/ld/configure.host b/ld/configure.host
index def726e821..cba013e6b2 100644
--- a/ld/configure.host
+++ b/ld/configure.host
@@ -67,6 +67,12 @@ case "${host}" in
   fi
   ;;
 
+*-*-openbsd*)
+  HOSTING_CRT0="-dynamic-linker /usr/libexec/ld.so /usr/lib/crt0.o"
+  HOSTING_CRT0="$HOSTING_CRT0 /usr/lib/crtbegin.o"
+  HOSTING_LIBS="$HOSTING_LIBS /usr/lib/crtend.o"
+  ;;
+
 esac
 
 #
@@ -230,6 +236,9 @@ x86_64-*-linux-*)
 *-*-netbsd*)
   ;;
 
+*-*-openbsd*)
+  ;;
+
 alpha*-*-*)
   HOSTING_CRT0=/usr/ccs/lib/crt0.o
   ;;