diff --git a/config.m4 b/config.m4
index d82741c..6a3fcde 100644
--- a/config.m4
+++ b/config.m4
@@ -21,17 +21,22 @@ if test "$PHP_ZOOKEEPER" != "no"; then
   if test "$PHP_LIBZOOKEEPER_DIR" != "no" && test "$PHP_LIBZOOKEEPER_DIR" != "yes"; then
     if test -r "$PHP_LIBZOOKEEPER_DIR/include/c-client-src/zookeeper.h"; then
       PHP_LIBZOOKEEPER_DIR="$PHP_LIBZOOKEEPER_DIR"
+    elif test -r "$PHP_LIBZOOKEEPER_DIR/include/zookeeper/zookeeper.h"; then
+      PHP_LIBZOOKEEPER_DIR="$PHP_LIBZOOKEEPER_DIR"
     else
       AC_MSG_ERROR([Can't find zookeeper headers under "$PHP_LIBZOOKEEPER_DIR"])
     fi
   else
     PHP_LIBZOOKEEPER_DIR="no"
     for i in /usr /usr/local; do
-	    if test -r "$i/include/c-client-src/zookeeper.h"; then
-	  	  PHP_LIBZOOKEEPER_DIR=$i
-	  	  break
-	    fi
-	  done
+      if test -r "$i/include/c-client-src/zookeeper.h"; then
+        PHP_LIBZOOKEEPER_DIR=$i
+    break
+      elif test -r "$i/include/zookeeper/zookeeper.h"; then
+        PHP_LIBZOOKEEPER_DIR=$i
+    break
+      fi
+    done
   fi
 
   AC_MSG_CHECKING([for libzookeeper location])
@@ -39,7 +44,11 @@ if test "$PHP_ZOOKEEPER" != "no"; then
     AC_MSG_ERROR([zookeeper support requires libzookeeper. Use --with-libzookeeper-dir=<DIR> to specify the prefix where libzookeeper headers and library are located])
   else
     AC_MSG_RESULT([$PHP_LIBZOOKEEPER_DIR])
-    PHP_LIBZOOKEEPER_INCDIR="$PHP_LIBZOOKEEPER_DIR/include/c-client-src"
+    if test -r "$PHP_LIBZOOKEEPER_DIR/include/c-client-src/zookeeper.h"; then
+      PHP_LIBZOOKEEPER_INCDIR="$PHP_LIBZOOKEEPER_DIR/include/c-client-src"
+    elif test -r "$PHP_LIBZOOKEEPER_DIR/include/zookeeper/zookeeper.h"; then
+      PHP_LIBZOOKEEPER_INCDIR="$PHP_LIBZOOKEEPER_DIR/include/zookeeper"
+    fi
     PHP_ADD_INCLUDE($PHP_LIBZOOKEEPER_INCDIR)
     PHP_ADD_LIBRARY_WITH_PATH(zookeeper_mt, $PHP_LIBZOOKEEPER_DIR/lib, ZOOKEEPER_SHARED_LIBADD)