---
 abi-tags                       |    2 +-
 configure                      |    4 +++-
 configure.in                   |    4 +++-
 shlib-versions                 |    4 ++++
 6 files changed, 14 insertions(+), 4 deletions(-)

--- 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
 
--- a/configure
+++ b/configure
@@ -4045,7 +4045,7 @@
 ###
 if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
   case "$machine-$host_os" in
-  *-linux* | *-gnu*)
+  *-linux* | *-gnu* | *-kfreebsd*)
     ;;
   *)
     echo "*** The GNU C library is currently not available for this platform."
@@ -4242,6 +4242,8 @@
   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.
--- a/configure.ac
+++ b/configure.ac
@@ -505,7 +505,7 @@
 ###
 if test -z "$enable_hacker_mode" && test x"$libc_config_ok" != xyes; then
   case "$machine-$host_os" in
-  *-linux* | *-gnu*)
+  *-linux* | *-gnu* | *-kfreebsd*)
     ;;
   *)
     echo "*** The GNU C library is currently not available for this platform."
@@ -659,6 +659,8 @@
   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.
--- a/shlib-versions
+++ b/shlib-versions
@@ -24,6 +24,7 @@
 powerpc64-.*-linux.*	DEFAULT			GLIBC_2.3
 powerpc.*le-.*-linux.*	DEFAULT			GLIBC_2.17
 .*-.*-gnu-gnu.*		DEFAULT			GLIBC_2.2.6
+.*-.*-kfreebsd.*	DEFAULT			GLIBC_2.3
 
 # Configuration		ABI			Identifier for ABI data files
 # -------------		----------		-----------------------------
@@ -38,11 +39,13 @@
 sh.*-.*-linux.*		libm=6			GLIBC_2.2
 .*-.*-linux.*		libm=6
 .*-.*-gnu-gnu.*		libm=6
+.*-.*-kfreebsd.*	libm=1
 
 # We provide libc.so.6 for Linux kernel versions 2.0 and later.
 sh.*-.*-linux.*		libc=6			GLIBC_2.2
 sparc64.*-.*-linux.*	libc=6			GLIBC_2.2
 .*-.*-linux.*		libc=6
+.*-.*-kfreebsd.*	libc=0.1
 
 # libmachuser.so.1 corresponds to mach/*.defs as of Utah's UK22 release.
 .*-.*-gnu-gnu.*		libmachuser=1