diff --git a/cmake/DD4hepConfig.cmake.in b/cmake/DD4hepConfig.cmake.in
index 4faf4c858de1f971bc8e885ae0d5cb81675df3f7..62d11c84a37d378e129b7adcf425b0d1e1bbbb7b 100644
--- a/cmake/DD4hepConfig.cmake.in
+++ b/cmake/DD4hepConfig.cmake.in
@@ -23,7 +23,7 @@ SET( DD4hep_INCLUDE_DIRS DD4hep_INCLUDE_DIRS-NOTFOUND )
 MARK_AS_ADVANCED( DD4hep_INCLUDE_DIRS )
 
 FIND_PATH( DD4hep_INCLUDE_DIRS
-	NAMES DD4hep/DD4hep.h
+	NAMES DD4hep/Detector.h
 	PATHS ${DD4hep_ROOT}/include
 	NO_DEFAULT_PATH
 )
@@ -36,8 +36,14 @@ SET( DD4hep_LIBRARY_DIRS ${DD4hep_ROOT}/lib )
 SET( DD4hep_LIBRARIES DD4hep_LIBRARIES-NOTFOUND )
 MARK_AS_ADVANCED( DD4hep_LIBRARY_DIRS DD4hep_LIBRARIES )
 
+
+SET( LIBNAMES  DD4hepCore DD4hepPlugins )
+if(@DD4HEP_WITH_GEANT4@)
+  LIST(APPEND  LIBNAMES DD4hepG4)
+endif()
+
 FIND_LIBRARY( DD4hep_LIBRARIES
-	NAMES DD4hep
+	NAMES ${LIBNAMES}
 	PATHS ${DD4hep_LIBRARY_DIRS}
 	NO_DEFAULT_PATH
 )