diff --git a/cmake/FindBIND.cmake b/cmake/FindBIND.cmake
index f81b2d3b91..5046bb29a7 100644
--- a/cmake/FindBIND.cmake
+++ b/cmake/FindBIND.cmake
@@ -15,9 +15,8 @@
 #
 #  BIND_FOUND                System has BIND, include and library dirs found
 #  BIND_INCLUDE_DIR          The BIND include directories. 
-#  BIND_LIBRARIES            All BIND libraries found.
-#  BIND_LIBRARY              The BIND library required for ns_inittab and
-#                            res_mkquery symbols.
+#  BIND_LIBRARY              The BIND library (if any) required for
+#                            ns_inittab and res_mkquery symbols
 
 find_path(BIND_ROOT_DIR
     NAMES include/resolv.h
@@ -28,17 +27,29 @@ find_path(BIND_INCLUDE_DIR
     HINTS ${BIND_ROOT_DIR}/include
 )
 
-find_library(BIND_LIBRARIES
-    NAMES resolv bind
-    HINTS ${BIND_ROOT_DIR}/lib
-)
+if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    # the static resolv library is preferred because
+    # on some systems, the ns_initparse symbol is not
+    # exported in the shared library (strangely)
+    # see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=291609
+    set(bind_libs none libresolv.a resolv bind)
+else ()
+    set(bind_libs none resolv bind)
+endif ()
 
 include(CheckCSourceCompiles)
 
 # Find which library has the res_mkquery and ns_initparse symbols
 set(CMAKE_REQUIRED_INCLUDES ${BIND_INCLUDE_DIR})
-foreach (bindlib ${BIND_LIBRARIES})
-    set(CMAKE_REQUIRED_LIBRARIES ${bindlib})
+foreach (bindlib ${bind_libs})
+    if (NOT ${bindlib} MATCHES "none")
+        find_library(BIND_LIBRARY
+            NAMES ${bindlib}
+            HINTS ${BIND_ROOT_DIR}/lib
+        )
+    endif ()
+
+    set(CMAKE_REQUIRED_LIBRARIES ${BIND_LIBRARY})
 
     check_c_source_compiles("
         #include <arpa/nameser.h>
@@ -46,7 +57,7 @@ foreach (bindlib ${BIND_LIBRARIES})
             ns_initparse(0, 0, 0);
             return 0;
         }
-" ns_initparse_works)
+" ns_initparse_works_${bindlib})
 
     check_c_source_compiles("
         #include <sys/types.h>
@@ -57,26 +68,34 @@ foreach (bindlib ${BIND_LIBRARIES})
         int main() {
             int (*p)() = res_mkquery;
         }
-" res_mkquery_works)
+" res_mkquery_works_${bindlib})
 
     unset(CMAKE_REQUIRED_LIBRARIES)
 
-    if (ns_initparse_works AND res_mkquery_works)
-        set(BIND_LIBRARY ${bindlib})
+    if (ns_initparse_works_${bindlib} AND res_mkquery_works_${bindlib})
         break ()
+    else ()
+        set(BIND_LIBRARY BIND_LIBRARY-NOTFOUND)
     endif ()
 endforeach ()
 unset(CMAKE_REQUIRED_INCLUDES)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(BIND DEFAULT_MSG
-    BIND_LIBRARY
-    BIND_INCLUDE_DIR
-)
+
+if (ns_initparse_works_none AND res_mkquery_works_none)
+    # system does not require linking to a BIND library
+    find_package_handle_standard_args(BIND DEFAULT_MSG
+        BIND_INCLUDE_DIR
+    )
+else ()
+    find_package_handle_standard_args(BIND DEFAULT_MSG
+        BIND_LIBRARY
+        BIND_INCLUDE_DIR
+    )
+endif ()
 
 mark_as_advanced(
     BIND_ROOT_DIR
-    BIND_LIBRARIES
     BIND_LIBRARY
     BIND_INCLUDE_DIR
 )