diff --git a/ChangeLog b/ChangeLog
index ff2c7fbe2..272f4d6c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Use -melf_*_haiku as target on haiku.
+
 2013-10-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.util.def: Add util/setup.c to extra_dist.
diff --git a/configure.ac b/configure.ac
index 8cacd47ed..c9ee9f842 100644
--- a/configure.ac
+++ b/configure.ac
@@ -663,6 +663,14 @@ case "$target_os" in
       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64_obsd"
     fi
     ;;
+  haiku*)
+    if test x"$target_cpu" = xi386; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386_haiku"
+    fi
+    if test x"$target_cpu" = xx86_64; then
+      TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_x86_64_haiku"
+    fi
+    ;;
   *)
     if test x"$target_cpu" = xi386; then
       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386"