diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index b1628cdd51..74391ed137 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2020-10-24  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* config.in: Re-generate.
+	* configure: Re-generate.
+
 2020-10-21  Simon Marchi  <simon.marchi@polymtl.ca>
 
 	* server.cc (handle_general_set): Don't use sprintf with
diff --git a/gdbserver/config.in b/gdbserver/config.in
index 63853b6189..99391b4acf 100644
--- a/gdbserver/config.in
+++ b/gdbserver/config.in
@@ -131,7 +131,7 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define to 1 if your system has the kinfo_getfile function. */
+/* Define to 1 if you have the `kinfo_getfile' function. */
 #undef HAVE_KINFO_GETFILE
 
 /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
diff --git a/gdbserver/configure b/gdbserver/configure
index 6e24cc4e15..95086d0f0a 100755
--- a/gdbserver/configure
+++ b/gdbserver/configure
@@ -7236,6 +7236,9 @@ _ACEOF
 fi
 
 
+  # On FreeBSD we need libutil for the kinfo_get* functions.  On
+  # GNU/kFreeBSD systems, FreeBSD libutil is renamed to libutil-freebsd.
+  # Figure out which one to use.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing kinfo_getfile" >&5
 $as_echo_n "checking for library containing kinfo_getfile... " >&6; }
 if ${ac_cv_search_kinfo_getfile+:} false; then :
@@ -7290,9 +7293,20 @@ ac_res=$ac_cv_search_kinfo_getfile
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
-$as_echo "#define HAVE_KINFO_GETFILE 1" >>confdefs.h
+fi
+
+
+  # Define HAVE_KINFO_GETFILE if kinfo_getfile is available.
+  for ac_func in kinfo_getfile
+do :
+  ac_fn_c_check_func "$LINENO" "kinfo_getfile" "ac_cv_func_kinfo_getfile"
+if test "x$ac_cv_func_kinfo_getfile" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_KINFO_GETFILE 1
+_ACEOF
 
 fi
+done
 
 
   # Check for std::thread.  This does not work on some platforms, like