diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8152ced1a9c268a73e0af90e55eea55ebc33f869..277af9e49ce753b28e95aab7fccb92b46ba90188 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,23 +83,23 @@ ENDIF()
 
 #---Packages------------------------------------------------------------------------
 
-#------ allow to use a pre-built DDSegmentation  ----------------------------
-find_package( DDSegmentation QUIET )
-if( NOT DDSegmentation_FOUND ) 
-  add_subdirectory(DDSegmentation)
-endif()
+##------ don't allow to use a pre-built DDSegmentation  ----------------------------
+#find_package( DDSegmentation QUIET )
+#if( NOT DDSegmentation_FOUND ) 
+#  add_subdirectory(DDSegmentation)
+#endif()
 
+add_subdirectory(DDSegmentation)
 add_subdirectory(DDCore)
 add_subdirectory(DDSurfaces)
 add_subdirectory(DDRec)
 add_subdirectory(DDSense)
 
 if(DD4HEP_USE_GEANT4)
-  add_subdirectory(DDG4)
 
   #--- create a geant4 variables for the thisdd4hep.sh script
-  find_package( Geant4 REQUIRED )
-  get_filename_component(Geant4_ROOT "${Geant4_INCLUDE_DIR}/../../" ABSOLUTE)
+  find_package( Geant4 REQUIRED  gdml ui_all vis_all)
+
 
   #----- if geant4 is build with external CLHEP we also need to export this fact
 
@@ -109,6 +109,8 @@ if(DD4HEP_USE_GEANT4)
 
     set( GEANT4_USE_CLHEP 1 )
 
+    get_filename_component(Geant4_ROOT "${Geant4_INCLUDE_DIR}/../../" ABSOLUTE)
+
     #---- use FindCLHEP shipped with geant4 -----------
     set(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH}  ${Geant4_ROOT}/cmake/Modules ) 
     
@@ -125,6 +127,13 @@ if(DD4HEP_USE_GEANT4)
     set( GEANT4_USE_CLHEP 0 )
   endif()
 
+  set(Geant4_INCLUDE_DIRS ${Geant4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS})
+  set(Geant4_LIBRARIES ${Geant4_LIBRARIES} ${CLHEP_LIBRARIES})
+
+
+#------- now configure DDG4 -------
+  add_subdirectory(DDG4)
+
 endif()
 
 
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index d3ca3f7787c1c6ef9d4f2a723e3c7df296c63784..f8d5e4aef7de22619778267431208ac4396e0893 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -1,6 +1,6 @@
 #---Find Geant4-------------------------------------------------------------------
 
-find_package(Geant4 REQUIRED gdml ui_all vis_all)
+#find_package(Geant4 REQUIRED gdml ui_all vis_all)
 #if(NOT Geant4_clhep_FOUND)
 #  find_package(CLHEP REQUIRED)
 #  set(Geant4_INCLUDE_DIRS ${Geant4_INCLUDE_DIRS} ${CLHEP_INCLUDE_DIRS})
diff --git a/DDSegmentation/CMakeLists.txt b/DDSegmentation/CMakeLists.txt
index 1a79773561fc7c795090145bd9bdd1d7eddd0dbc..0ed335ca1bb8d3e64e95d8d86ec470c5e1fe7d16 100644
--- a/DDSegmentation/CMakeLists.txt
+++ b/DDSegmentation/CMakeLists.txt
@@ -1,11 +1,11 @@
 cmake_minimum_required(VERSION 2.8.3 FATAL_ERROR)
 project(DDSegmentation)
- 
+ #fg: version number must be the same as DD4hep !!
 set(DDSegmentation_MAJOR_VERSION 0)
-set(DDSegmentation_MINOR_VERSION 1)
+set(DDSegmentation_MINOR_VERSION 6)
 set(DDSegmentation_PATCH_VERSION 0)
-set(DDSegmentation_VERSION ${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}.${DDSegmentation_PATCH_VERSION})
-set(DDSegmentation_SOVERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}.${DDSegmentation_PATCH_VERSION}" )
+set(DDSegmentation_VERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}" )
+set(DDSegmentation_SOVERSION "${DDSegmentation_MAJOR_VERSION}.${DDSegmentation_MINOR_VERSION}")
 
 #------------- set the default installation directory to be the source directory
 
diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 03cd342e02e65d629fe23c678c77aec3db9b5b46..558c7fc1535b88f588f4f01411394c9747f92e63 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -53,6 +53,8 @@ if(@DD4HEP_USE_GEANT4@)
     set(GEANT4_USE_CLHEP  1 ) 
   endif()
 
+  set( Geant4_DIR @Geant4_DIR@)
+
 else()
   CHECK_PACKAGE_LIBS( DD4hep DD4hepCore DDSegmentation DD4hepRec DD4hepPlugins ) 
 endif()