diff --git a/ChangeLog b/ChangeLog
index af66d3a56..42cf3dca3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-12  Ilya Bakulin <Ilya_Bakulin@genua.de>
+
+	* configure.ac: Use -melf_*_obsd on openbsd.
+
 2013-10-12  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/arm/dl_helper.c: Use more proper %p for pointer.
diff --git a/configure.ac b/configure.ac
index ed2ff2337..d3082c785 100644
--- a/configure.ac
+++ b/configure.ac
@@ -655,6 +655,14 @@ case "$target_os" in
       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64_fbsd"
     fi
     ;;
+  openbsd*)
+    if test x"$target_cpu" = xi386; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386_obsd"
+    fi
+    if test x"$target_cpu" = xx86_64; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64_obsd"
+    fi
+    ;;
   *)
     if test x"$target_cpu" = xi386; then
       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386"