diff --git a/abi-tags b/abi-tags
index 87cd6816..f44c7478 100644
--- a/abi-tags
+++ b/abi-tags
@@ -22,7 +22,7 @@
 
 .*-sun-solaris2.*	2	2.0.0	# just an arbitrary value
 
-.*-.*-freebsd.*-gnu.*	3	4.0.0	# earliest compatible kernel version
+.*-.*-kfreebsd.*	3	5.4.0	# earliest compatible kernel version
 
 .*-.*-knetbsd.*-gnu.*	4	1.6.0	# earliest compatible kernel version
 
diff --git a/configure b/configure
index ff2c406b..841bc8c6 100755
--- a/configure
+++ b/configure
@@ -3916,7 +3916,7 @@ fi
 ###
 if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
   case "$machine-$host_os" in
-  *-linux* | *-gnu*)
+  *-linux* | *-gnu* | *-kfreebsd*)
     ;;
   *)
     as_fn_error $? "
@@ -4263,6 +4263,8 @@ gnu*)
   base_os=mach/hurd ;;
 linux*)
   base_os=unix/sysv ;;
+k*bsd*)
+  base_os=unix/bsd/bsd4.4 ;;
 esac
 
 # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.
diff --git a/configure.ac b/configure.ac
index eb5bc6a1..8503389f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -542,7 +542,7 @@ LIBC_PRECONFIGURE([$srcdir], [for sysdeps])
 ###
 if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
   case "$machine-$host_os" in
-  *-linux* | *-gnu*)
+  *-linux* | *-gnu* | *-kfreebsd*)
     ;;
   *)
     AC_MSG_ERROR([
@@ -798,6 +798,8 @@ gnu*)
   base_os=mach/hurd ;;
 linux*)
   base_os=unix/sysv ;;
+k*bsd*)
+  base_os=unix/bsd/bsd4.4 ;;
 esac
 
 # For sunos4.1.1, try sunos4.1.1, then sunos4.1, then sunos4, then sunos.