diff --git a/ChangeLog b/ChangeLog
index 201050f10..7e17a9bc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Use elf_*_fbsd on kfreebsd.
+
 2013-11-08  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/tests/div_test.c: New test.
diff --git a/configure.ac b/configure.ac
index a399aaee7..ea38f090f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -690,7 +690,7 @@ AC_SUBST([enable_efiemu])
 case "$target_os" in
   cygwin)
     ;;
-  freebsd)
+  freebsd | kfreebsd*-gnu)
     if test x"$target_cpu" = xi386; then
       TARGET_LDFLAGS="$TARGET_LDFLAGS -Wl,-melf_i386_fbsd"
     fi