diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7457c1b5..35328f2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -154,7 +154,7 @@ INCLUDE(PCHSupport)
 ####################################
 #include sub-projects
 ADD_SUBDIRECTORY (src/core)
-ADD_SUBDIRECTORY (src/contrib EXCLUDE_FROM_ALL)
+ADD_SUBDIRECTORY (src/contrib)
 ADD_SUBDIRECTORY (src/demo EXCLUDE_FROM_ALL)
 ADD_SUBDIRECTORY (src/test)
 
@@ -163,8 +163,14 @@ ADD_SUBDIRECTORY (src/test)
 # install pkg-config file
 #################################
 IF(NOT WIN32)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc @ONLY)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++.pc.cmake
+                 ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/liblucene++-contrib.pc.cmake
+                 ${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc @ONLY)
+
+  install(FILES
+          ${CMAKE_CURRENT_BINARY_DIR}/liblucene++.pc
+          ${CMAKE_CURRENT_BINARY_DIR}/liblucene++-contrib.pc
           DESTINATION ${LIB_DESTINATION}/pkgconfig )
 ENDIF(NOT WIN32)
 
diff --git a/cmake/Lucene++Docs.cmake b/cmake/Lucene++Docs.cmake
index bf2938b5..52f2f246 100644
--- a/cmake/Lucene++Docs.cmake
+++ b/cmake/Lucene++Docs.cmake
@@ -138,7 +138,12 @@ IF (ENABLE_DOCS)
             )
         ENDIF ( TAR AND GZIP )
         
-        #install man if it was built
+	#install HTML pages if they were built
+	IF ( DOCS_HTML AND NOT WIN32 )
+            INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/html/ DESTINATION share/doc/lucene++-${LUCENE++_VERSION})
+        ENDIF ( DOCS_HTML AND NOT WIN32 )
+
+        #install man pages if they were built
         IF ( DOCS_MAN )
             INSTALL(DIRECTORY ${PROJECT_BINARY_DIR}/doc/man/ DESTINATION man)
         ENDIF ( DOCS_MAN )
diff --git a/cmake/MacroCheckGccVisibility.cmake b/cmake/MacroCheckGccVisibility.cmake
index 2022aa31..4fb6f8ad 100644
--- a/cmake/MacroCheckGccVisibility.cmake
+++ b/cmake/MacroCheckGccVisibility.cmake
@@ -43,7 +43,7 @@ macro(MACRO_CHECK_GCC_VISIBILITY GccVisibility)
 
    if (${GccVisibility} AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR)
       set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-      set (KDE4_C_FLAGS "${KDE4_C_FLAGS}" "-fvisibility=hidden")
+      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden")
 
       if (GCC_IS_NEWER_THAN_4_2)
           set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
diff --git a/liblucene++-contrib.pc.cmake b/liblucene++-contrib.pc.cmake
new file mode 100644
index 00000000..8e02e3e5
--- /dev/null
+++ b/liblucene++-contrib.pc.cmake
@@ -0,0 +1,14 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}/bin
+libdir=${prefix}/@LIB_DESTINATION@
+includedir=${prefix}/include/lucene++
+lib=lucene++-contrib
+
+Name: liblucene++-contrib
+Description: Contributions for Lucene++ - a C++ search engine, ported from the popular Apache Lucene
+Version: @LUCENE++_VERSION@
+Libs: -L${prefix}/@LIB_DESTINATION@/ -l${lib}
+Cflags: -I${includedir}
+Requires: liblucene++=@LUCENE++_VERSION@
+~
+
diff --git a/src/contrib/CMakeLists.txt b/src/contrib/CMakeLists.txt
index 96c7d5dd..89e03b3b 100644
--- a/src/contrib/CMakeLists.txt
+++ b/src/contrib/CMakeLists.txt
@@ -17,7 +17,7 @@ INCLUDE_DIRECTORIES(${lucene++-contrib_SOURCE_DIR}/include)
 INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIRS})
 LINK_DIRECTORIES(${Boost_LIBRARY_DIRS})
 
-install(FILES HEADERS
+install(FILES ${HEADERS}
 		        DESTINATION include/lucene++
 		        COMPONENT development-contrib)
 
@@ -47,7 +47,8 @@ SET_TARGET_PROPERTIES(lucene++-contrib PROPERTIES
     COMPILE_FLAGS -DLPP_HAVE_DLL
 )
 TARGET_LINK_LIBRARIES(lucene++-contrib 
-  ${CMAKE_THREAD_LIBS_INIT})
+  ${CMAKE_THREAD_LIBS_INIT}
+  lucene++)
 install(TARGETS lucene++-contrib
 	        DESTINATION ${LIB_DESTINATION} 
 	        COMPONENT runtime )
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 5639a2c7..c839f563 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -48,6 +48,7 @@ ADD_PRECOMPILED_HEADER(lucene++ ${lucene++-lib_SOURCE_DIR}/include/LuceneInc.h)
 SET_TARGET_PROPERTIES(lucene++ PROPERTIES
     VERSION ${LUCENE++_VERSION}
     SOVERSION ${LUCENE++_SOVERSION}
+    COMPILE_FLAGS -DLPP_HAVE_DLL
 )
 TARGET_LINK_LIBRARIES(lucene++ 
   lucene++-c 
@@ -63,7 +64,6 @@ install(TARGETS lucene++
 ADD_LIBRARY(lucene++-static STATIC EXCLUDE_FROM_ALL
 	${lucene_sources} ${HEADERS} ${INTERN_HEADERS}
 )
-SET(PCH_ADDITIONAL_COMPILER_FLAGS_lucene++-static -DLPP_HAVE_DLL)
 ADD_PRECOMPILED_HEADER(lucene++-static ${lucene++-lib_SOURCE_DIR}/include/LuceneInc.h)
 #set properties on the libraries
 SET_TARGET_PROPERTIES(lucene++-static PROPERTIES
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 36ab3368..b1e2a28f 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -33,5 +33,5 @@ TARGET_LINK_LIBRARIES(lucene++-tester
   ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY_RELEASE}
   ${LUCENE_BOOST_LIBS} )
 
-ADD_TEST(${EXECUTABLE_OUTPUT_PATH}/lucene++-tester ${EXECUTABLE_OUTPUT_PATH}/lucene++-tester -p)
+ADD_TEST(lucene++-tester ${EXECUTABLE_OUTPUT_PATH}/lucene++-tester -p --test_dir=${lucene++-tester_SOURCE_DIR}/testfiles)