diff --git a/configure.in b/configure.in
index cb7687acbe..224a04a457 100644
--- a/configure.in
+++ b/configure.in
@@ -118,7 +118,7 @@ dnl CPU_TYPE=ppc64
     MAKEFILE_PREFIX=freebsd_amd64
     case "$target" in
         x86_64*-*-k*bsd-gnu)      # Debian/kFreeBSD
-            PLATFORM=LINUX
+            PLATFORM=GENTOOFREEBSD
             INSTALL_PREFIX=linux
             ;;
 		*)
@@ -140,11 +140,11 @@ dnl CPU_TYPE=ppc64
     SHRLIB_EXT=so
     ;;
 
-  *-*-freebsd*)
+  *-*-freebsd* | *-*-k*bsd*-gnu)
     MAKEFILE_PREFIX=freebsd
     case "$target" in
         *-*-k*bsd-gnu)      # Debian/kFreeBSD
-            PLATFORM=LINUX
+            PLATFORM=GENTOOFREEBSD
             INSTALL_PREFIX=linux
             ;;
         *)
@@ -178,7 +178,7 @@ dnl CPU_TYPE=ppc64
     PTHREAD_LIBS=-lpthread
     ;;
 
-  x86_64*-*-linux*)
+  x86_64*-*-linux* | x86_64*-*-gnu*)
     MAKEFILE_PREFIX=linux_amd64
     INSTALL_PREFIX=linux
     PLATFORM=LINUX
@@ -217,7 +217,7 @@ dnl CPU_TYPE=ppc64
     STD_ICU=true
     ;;
 
-  sparc*-*-linux*)
+  sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu)
     MAKEFILE_PREFIX=linux_sparc32
     INSTALL_PREFIX=linux
     PLATFORM=LINUX
@@ -275,7 +275,7 @@ dnl CPU_TYPE=ppc64
     SHRLIB_EXT=so
     ;;
 
-  *-*-linux*)
+  *-*-linux* | *-*-gnu*)
     MAKEFILE_PREFIX=linux_generic
     INSTALL_PREFIX=linux
     PLATFORM=LINUX