diff --git a/LCG_Interfaces/CLHEP/CMakeLists.txt b/LCG_Interfaces/CLHEP/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1329eeee2f0dbe1f33efd6c7f2b73c576438000f
--- /dev/null
+++ b/LCG_Interfaces/CLHEP/CMakeLists.txt
@@ -0,0 +1,10 @@
+################################################################################
+# Package: CLHEP
+################################################################################
+
+# Declare the package name:
+atlas_subdir( CLHEP )
+
+# this line failed automatic conversion in cmt2cmake :
+# macro CLHEP_linkopts "-L$(CLHEP_home)/lib   -lCLHEP-$(CLHEP_native_version)
+
diff --git a/LCG_Interfaces/CLHEP/cmt/requirements b/LCG_Interfaces/CLHEP/cmt/requirements
index e6ef43716932f381f164ad3579a6c81e64fcc6ba..5cd3d19000e7e12c0908b7420708d3891f6afdf4 100644
--- a/LCG_Interfaces/CLHEP/cmt/requirements
+++ b/LCG_Interfaces/CLHEP/cmt/requirements
@@ -3,21 +3,18 @@ package CLHEP
 use LCG_Configuration v*
 use LCG_Settings      v*
 
-### use specific for ATLAS CLHEP 2.1.2.3-atl01
-macro CLHEP_native_version "2.1.2.3"
-macro CLHEP_ATLAS_specific_native_version "2.1.2.3-atl01"
-
-macro CLHEP_home $(LCG_external)/clhep/$(CLHEP_ATLAS_specific_native_version)/$(LCG_system) \
-      target-gcc48 "${SITEROOT}/sw/lcg/external/clhep/$(CLHEP_ATLAS_specific_native_version)/$(LCG_system)" \
-      target-gcc49 "${SITEROOT}/sw/lcg/external/clhep/$(CLHEP_ATLAS_specific_native_version)/$(LCG_system)"
+# Use CLHEP 2.2.0.4
+macro CLHEP_native_version "2.2.0.4"
 
+# overwrite with fixed location, needed for newer LCGs
+macro CLHEP_home "${SITEROOT}/sw/lcg/external/clhep/$(CLHEP_native_version)/$(LCG_system)"
 macro CLHEP_include "$(CLHEP_home)/include"
 
 include_path none
 include_dirs $(CLHEP_home)/include
 
 macro CLHEP_linkopts "-L$(CLHEP_home)/lib  \
-       -lCLHEP-$(CLHEP_native_version)  "
+      -lCLHEP-$(CLHEP_native_version)
 
 macro CLHEP_name "clhep"
 apply_pattern set_lib_path