diff --git a/CMakeModules/FindLuabind.cmake b/CMakeModules/FindLuabind.cmake
index 81cbbfee7..000c63bb2 100644
--- a/CMakeModules/FindLuabind.cmake
+++ b/CMakeModules/FindLuabind.cmake
@@ -119,11 +119,6 @@ IF(WITH_LUA54)
   LIST(APPEND LIBRARY_NAME_DEBUG luabind_lua54d)
 ENDIF()
 
-IF(HUNTER_ENABLED)
-  LIST(APPEND LIBRARY_NAME_RELEASE luabind luabind09)
-  LIST(APPEND LIBRARY_NAME_DEBUG luabindd luabind09-d)
-ENDIF()
-
 IF(WITH_LUA53)
   IF(WITH_STLPORT)
     LIST(APPEND LIBRARY_NAME_RELEASE luabind_stlport_lua53)
@@ -170,8 +165,8 @@ IF(WITH_STLPORT)
 ENDIF()
 
 # generic libraries names
-LIST(APPEND LIBRARY_NAME_RELEASE luabind libluabind)
-LIST(APPEND LIBRARY_NAME_DEBUG luabind_d luabindd libluabind_d libluabindd)
+LIST(APPEND LIBRARY_NAME_RELEASE luabind luabind09 libluabind)
+LIST(APPEND LIBRARY_NAME_DEBUG luabind_d luabindd luabind09-d libluabind_d libluabindd)
 
 FIND_PACKAGE_HELPER(Luabind luabind/luabind.hpp RELEASE ${LIBRARY_NAME_RELEASE} DEBUG ${LIBRARY_NAME_DEBUG})