diff --git a/cmake/modules/modules/FindCHM.cmake b/cmake/modules/modules/FindCHM.cmake
new file mode 100644
index 000000000..85d2b7c3e
--- /dev/null
+++ b/cmake/modules/modules/FindCHM.cmake
@@ -0,0 +1,36 @@
+# - Try to find the chm library
+# Once done this will define
+#
+#  CHM_FOUND - system has the chm library
+#  CHM_INCLUDE_DIR - the chm include directory
+#  CHM_LIBRARY - Link this to use the chm library
+#
+include(CheckLibraryExists)
+
+# reset vars
+set(CHM_INCLUDE_DIR)
+set(CHM_LIBRARY)
+
+FIND_PATH(CHM_INCLUDE_DIR chm_lib.h
+  /usr/local/include
+  /usr/include
+  ${GNUWIN32_DIR}/include
+)
+
+#check_library_exists(chm ??? "" CHM_LIBRARY)
+
+if(CHM_INCLUDE_DIR)
+  set(CHM_FOUND TRUE)
+endif(CHM_INCLUDE_DIR)
+
+if (CHM_FOUND)
+  if (NOT CHM_FIND_QUIETLY)
+    message(STATUS "Found CHM: ${CHM_LIBRARY}")
+  endif (NOT CHM_FIND_QUIETLY)
+else (CHM_FOUND)
+  if (CHM_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find CHM")
+  endif (CHM_FIND_REQUIRED)
+endif (CHM_FOUND)
+
+MARK_AS_ADVANCED(CHM_INCLUDE_DIR CHM_LIBRARY)
diff --git a/cmake/modules/modules/FindQGS.cmake b/cmake/modules/modules/FindQGS.cmake
new file mode 100644
index 000000000..d9b2875ce
--- /dev/null
+++ b/cmake/modules/modules/FindQGS.cmake
@@ -0,0 +1,36 @@
+# - Try to find the qgs library
+# Once done this will define
+#
+#  QGS_FOUND - system has qgs
+#  QGS_INCLUDE_DIR - the qgs include directory
+#  QGS_LIBRARY - Link this to use qgs
+#
+include(CheckLibraryExists)
+
+# reset vars
+set(QGS_INCLUDE_DIR)
+set(QGS_LIBRARY)
+
+FIND_PATH(QGS_INCLUDE_DIR qgs.h
+  /usr/local/include
+  /usr/include
+  ${GNUWIN32_DIR}/include
+)
+
+check_library_exists(qgs main "" QGS_LIBRARY)
+
+if(QGS_INCLUDE_DIR AND QGS_LIBRARY)
+  set(QGS_FOUND TRUE)
+endif(QGS_INCLUDE_DIR AND QGS_LIBRARY)
+
+if (QGS_FOUND)
+  if (NOT QGS_FIND_QUIETLY)
+    message(STATUS "Found qgs: ${QGS_LIBRARY}")
+  endif (NOT QGS_FIND_QUIETLY)
+else (QGS_FOUND)
+  if (QGS_FIND_REQUIRED)
+    message(FATAL_ERROR "Could NOT find QGS")
+  endif (QGS_FIND_REQUIRED)
+endif (QGS_FOUND)
+
+MARK_AS_ADVANCED(QGS_INCLUDE_DIR QGS_LIBRARY)
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index 225e719e0..e4d62d474 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -1,11 +1,19 @@
 kde4_header()
 
-add_subdirectory( poppler ) 
+# let's enable the generators properly configured
+
+if(POPPLER_FOUND)
+  add_subdirectory(poppler)
+endif(POPPLER_FOUND)
+if(QGS_FOUND)
+  add_subdirectory(ghostview)
+endif(QGS_FOUND)
 add_subdirectory( fax ) 
 add_subdirectory( kimgio ) 
+if(CHM_FOUND)
+  add_subdirectory( chm )
+endif(CHM_FOUND)
 
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(GSPLUGINDIR)")
-message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(CHMPLUGINDIR)")
 include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES}  )
 
 
diff --git a/generators/poppler/CMakeLists.txt b/generators/poppler/CMakeLists.txt
index b344e8f15..99f936a93 100644
--- a/generators/poppler/CMakeLists.txt
+++ b/generators/poppler/CMakeLists.txt
@@ -1,6 +1,6 @@
 kde4_header()
 
-include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular  )
+include_directories( ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/okular ${POPPLER_INCLUDE_DIR}/poppler )
 
 
 ########### next target ###############
@@ -13,7 +13,7 @@ kde4_add_plugin(okularGenerator_poppler WITH_PREFIX ${okularGenerator_poppler_PA
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} okularGenerator_poppler )
 
-target_link_libraries(okularGenerator_poppler  ${KDE4_KDECORE_LIBS} oKular ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} m )
+target_link_libraries(okularGenerator_poppler  ${KDE4_KDECORE_LIBS} oKular ${POPPLER_LIBRARY} ${KDE4_KDEPRINT_LIBS} ${KDE4_KDEUI_LIBS} m )
 
 install_targets(${LIB_INSTALL_DIR}/kde4 okularGenerator_poppler )