diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake
index d7c318241..04ce952aa 100644
--- a/CMakeModules/FindCLucene.cmake
+++ b/CMakeModules/FindCLucene.cmake
@@ -20,6 +20,8 @@ IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
   INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake)
 ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake)
 
+MESSAGE(STATUS "LIB_SUFFIX is ${LIB_SUFFIX}")
+
 SET(TRIAL_LIBRARY_PATHS
   $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX}
   ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
@@ -39,7 +41,7 @@ SET(TRIAL_INCLUDE_PATHS
   )
 FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY
   WIN32_DEBUG_POSTFIX d
-  NAMES clucene clucene-core
+  NAMES clucene-shared clucene-core
   PATHS ${TRIAL_LIBRARY_PATHS})
 IF (CLUCENE_LIBRARY)
   MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}")
@@ -59,10 +61,11 @@ ENDIF(WIN32)
 SET(CLUCENE_GOOD_VERSION TRUE)
 
 FIND_PATH(CLUCENE_LIBRARY_DIR
-  NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
+	NAMES CLuceneConfig.cmake/CLuceneConfig.cmake
+       	PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH)
 IF (CLUCENE_LIBRARY_DIR)
   MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}")
-  FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT)
+  FILE(READ ${CLUCENE_LIBRARY_DIR}/CLuceneConfig.cmake/CLuceneConfig.cmake CLCONTENT)
   STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT})
   IF (CLMATCH)
     STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH})