diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index c41734a3cc5..6896c67b757 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,9 @@
+2016-03-29  Samuel Thibault  <samuel.thibault@ens-lyon.org>
+
+	* configure.host: Set gc_use_mmap on *-kfreebsd-gnu* and *-gnu*.
+	* include/private/gcconfig.h [HURD && USE_MMAP]: Define
+	USE_MMAP_ANON.
+
 2016-03-16  Andreas Schwab  <schwab@suse.de>
 
 	* include/private/gcconfig.h [AARCH64] (ALIGNMENT, CPP_WORDSZ):
diff --git a/boehm-gc/configure.host b/boehm-gc/configure.host
index 97f4dacb6de..229a03877b9 100644
--- a/boehm-gc/configure.host
+++ b/boehm-gc/configure.host
@@ -41,7 +41,7 @@ else
 fi
 
 case "${host}" in
-  *-linux*)
+  *-linux*|*-kfreebsd-gnu*|*-gnu*)
     gc_use_mmap=yes
     ;;
 esac
diff --git a/boehm-gc/include/private/gcconfig.h b/boehm-gc/include/private/gcconfig.h
index aa81f15b06c..44b9d7d86c3 100644
--- a/boehm-gc/include/private/gcconfig.h
+++ b/boehm-gc/include/private/gcconfig.h
@@ -2137,7 +2137,7 @@
 #   endif
 # endif
 
-#if defined(LINUX) && defined(USE_MMAP)
+#if (defined(LINUX) || defined(HURD)) && defined(USE_MMAP)
     /* The kernel may do a somewhat better job merging mappings etc.	*/
     /* with anonymous mappings.						*/
 #   define USE_MMAP_ANON