diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6c5f6ec11693110061a1ed343adcce85f75bac74..12a0f3ab31706eeb8349c46e6b132aeebeee296d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,6 +126,11 @@ add_subdirectory(DDDetectors)
 add_subdirectory(DDCond)
 add_subdirectory(DDAlign)
 if ( DD4HEP_USE_GEANT4 )
+  if(Geant4_builtin_clhep_FOUND)
+    set(CLHEP "")
+  else()
+    set(CLHEP CLHEP)
+  endif()
   add_subdirectory(DDG4)
 endif()
 # Note the order: DDEve partially depends on variables from DDG4!
diff --git a/DDG4/CMakeLists.txt b/DDG4/CMakeLists.txt
index df438aa03969f4891bf4a054392bc77e0f74bd22..6f6943c38e053811dec863db8c7d148c1d0fd4a5 100644
--- a/DDG4/CMakeLists.txt
+++ b/DDG4/CMakeLists.txt
@@ -12,7 +12,7 @@ dd4hep_package(    DDG4
   USES            [GEANT4 REQUIRED COMPONENTS gdml ui_all vis_all]
                   [ROOT   REQUIRED COMPONENTS Geom GenVector RIO]
                    BOOST DDCore
-  OPTIONAL         CLHEP [XercesC QUIET]
+  OPTIONAL         ${CLHEP} [XercesC QUIET]
   INCLUDE_DIRS     include
   INSTALL_INCLUDES include/DDG4 )
 MESSAGE(STATUS "CLHEP_LIBRARIES ${CLHEP_LIBRARIES} ${CLHEP_LIBRARY}")