diff --git a/CHANGES b/CHANGES
index 07683b25..c4779027 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
 08 Jun 2012 - 2.6.6
 -------------------
 
+ * Added build system support for KfreeBSD and HURD.
+
  * In 2009, Stefan Esser published an evasion technique that relies on the use of single quotes and PHP.
    The trick was treating a request parameter as a file. A patch was applied into ModSecurity 2.5.11 by Brian Rectanus.
    Ivan Ristic reported that the patch was imcomplete. We added extra checks for this evasion.
diff --git a/configure.ac b/configure.ac
index ef4a4290..817d7528 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,12 +110,20 @@ case $host in
     freebsdos=true
     ;;
   *-*-netbsd*)
-    echo "Checking plataform... Identified as FreeBSD"
+    echo "Checking plataform... Identified as NetBSD"
     netbsdos=true
     ;;
   *-*-openbsd*)
-    echo "Checking plataform... Identified as FreeBSD"
+    echo "Checking plataform... Identified as OpenBSD"
     openbsdos=true
+    ;;
+  *-*-kfreebsd*)
+    echo "Checking plataform... Identified as kFreeBSD, treating as linux"
+    linuxos=true
+    ;;
+  *-*-gnu*.*)
+    echo "Checking plataform... Identified as HURD, treating as linux"
+    linuxos=true
     ;;
        *)
     echo "Unknown CANONICAL_HOST $host"