diff --git a/CMakeLists.txt b/CMakeLists.txt
index 298919c16f8f393f1f221f3f7c0aa28b3f0e2ecb..0d5338ebfcf140936dcd76bb47228c40a537bd6e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ if(DEFINED ENV{G4_NATIVE_VERSION})
 endif()
 
 find_package(GaudiProject)
-gaudi_project(Geant4 v95r2p8g1
+gaudi_project(Geant4 v95r2p8g2
               DATA Geant4Files VERSION v95r*)
 
 file(MAKE_DIRECTORY ${CMAKE_INSTALL_PREFIX})
diff --git a/Geant4/G4FR/cmt/version.cmt b/Geant4/G4FR/cmt/version.cmt
deleted file mode 100644
index d3c5627158d221b919d16392d48244b59869f51b..0000000000000000000000000000000000000000
--- a/Geant4/G4FR/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r4
diff --git a/Geant4/G4GDML/cmt/version.cmt b/Geant4/G4GDML/cmt/version.cmt
deleted file mode 100644
index cf3d02387ac052f893a7da9b5aa1c793620c633e..0000000000000000000000000000000000000000
--- a/Geant4/G4GDML/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r0
diff --git a/Geant4/G4LHCblists/cmt/version.cmt b/Geant4/G4LHCblists/cmt/version.cmt
deleted file mode 100644
index 25cbc4f2e2ff942846408f05f2f8353fbcaa3d8a..0000000000000000000000000000000000000000
--- a/Geant4/G4LHCblists/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v3r0
diff --git a/Geant4/G4OpenGL/cmt/version.cmt b/Geant4/G4OpenGL/cmt/version.cmt
deleted file mode 100644
index d3c5627158d221b919d16392d48244b59869f51b..0000000000000000000000000000000000000000
--- a/Geant4/G4OpenGL/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r4
diff --git a/Geant4/G4RayTracer/cmt/version.cmt b/Geant4/G4RayTracer/cmt/version.cmt
deleted file mode 100644
index 3c20424588a10663a4a7f3376fc4129fdfc94e33..0000000000000000000000000000000000000000
--- a/Geant4/G4RayTracer/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4Tree/cmt/version.cmt b/Geant4/G4Tree/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8d602ab0d7c9fed773dde3cbccc44c7..0000000000000000000000000000000000000000
--- a/Geant4/G4Tree/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4UIGAG/cmt/version.cmt b/Geant4/G4UIGAG/cmt/version.cmt
deleted file mode 100644
index 46c5e3d46748dd81c4b92e8c2830ce6599527ce3..0000000000000000000000000000000000000000
--- a/Geant4/G4UIGAG/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r2
diff --git a/Geant4/G4UIbasic/cmt/version.cmt b/Geant4/G4UIbasic/cmt/version.cmt
deleted file mode 100644
index cd4633b6ae643ca477ef1c0d6d2522a98e697383..0000000000000000000000000000000000000000
--- a/Geant4/G4UIbasic/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r3
diff --git a/Geant4/G4UIcommon/cmt/version.cmt b/Geant4/G4UIcommon/cmt/version.cmt
deleted file mode 100644
index 709d940eb9b6ec733f829757cb55e6e3037531ba..0000000000000000000000000000000000000000
--- a/Geant4/G4UIcommon/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r3
diff --git a/Geant4/G4VRML/cmt/version.cmt b/Geant4/G4VRML/cmt/version.cmt
deleted file mode 100644
index 46c5e3d46748dd81c4b92e8c2830ce6599527ce3..0000000000000000000000000000000000000000
--- a/Geant4/G4VRML/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r2
diff --git a/Geant4/G4analysis/cmt/version.cmt b/Geant4/G4analysis/cmt/version.cmt
deleted file mode 100644
index cf3d02387ac052f893a7da9b5aa1c793620c633e..0000000000000000000000000000000000000000
--- a/Geant4/G4analysis/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r0
diff --git a/Geant4/G4config/cmt/version.cmt b/Geant4/G4config/cmt/version.cmt
deleted file mode 100644
index b24857a4df1da1672d7fb38d80030afb29f6b2e5..0000000000000000000000000000000000000000
--- a/Geant4/G4config/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v95r2p8
diff --git a/Geant4/G4digits_hits/cmt/version.cmt b/Geant4/G4digits_hits/cmt/version.cmt
deleted file mode 100644
index b3a878f325c669193bd8d3ff2186a04663bba1f1..0000000000000000000000000000000000000000
--- a/Geant4/G4digits_hits/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v7r1p1
diff --git a/Geant4/G4event/cmt/version.cmt b/Geant4/G4event/cmt/version.cmt
deleted file mode 100644
index 191dd2f347bf940d150160d4741310e356dd5198..0000000000000000000000000000000000000000
--- a/Geant4/G4event/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r0p1
diff --git a/Geant4/G4examples/cmt/version.cmt b/Geant4/G4examples/cmt/version.cmt
deleted file mode 100644
index 318ea395e61f24d201b2113eb528b8fa11d901b2..0000000000000000000000000000000000000000
--- a/Geant4/G4examples/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1
diff --git a/Geant4/G4externals/cmt/version.cmt b/Geant4/G4externals/cmt/version.cmt
deleted file mode 100644
index cf3d02387ac052f893a7da9b5aa1c793620c633e..0000000000000000000000000000000000000000
--- a/Geant4/G4externals/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r0
diff --git a/Geant4/G4geometry/cmt/version.cmt b/Geant4/G4geometry/cmt/version.cmt
deleted file mode 100644
index 46c246f83f462d3a6008948ffd513050ae9005a2..0000000000000000000000000000000000000000
--- a/Geant4/G4geometry/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r2p1
diff --git a/Geant4/G4global/cmt/version.cmt b/Geant4/G4global/cmt/version.cmt
deleted file mode 100644
index 3c20424588a10663a4a7f3376fc4129fdfc94e33..0000000000000000000000000000000000000000
--- a/Geant4/G4global/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4graphics_reps/cmt/version.cmt b/Geant4/G4graphics_reps/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8d602ab0d7c9fed773dde3cbccc44c7..0000000000000000000000000000000000000000
--- a/Geant4/G4graphics_reps/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4intercoms/cmt/version.cmt b/Geant4/G4intercoms/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8d602ab0d7c9fed773dde3cbccc44c7..0000000000000000000000000000000000000000
--- a/Geant4/G4intercoms/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4materials/cmt/version.cmt b/Geant4/G4materials/cmt/version.cmt
deleted file mode 100644
index 44c345dd0776a80dbc652a8021210e9c59d3ee31..0000000000000000000000000000000000000000
--- a/Geant4/G4materials/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r0p1
diff --git a/Geant4/G4modeling/cmt/version.cmt b/Geant4/G4modeling/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8d602ab0d7c9fed773dde3cbccc44c7..0000000000000000000000000000000000000000
--- a/Geant4/G4modeling/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4parmodels/cmt/version.cmt b/Geant4/G4parmodels/cmt/version.cmt
deleted file mode 100644
index 46c246f83f462d3a6008948ffd513050ae9005a2..0000000000000000000000000000000000000000
--- a/Geant4/G4parmodels/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r2p1
diff --git a/Geant4/G4particles/cmt/version.cmt b/Geant4/G4particles/cmt/version.cmt
deleted file mode 100644
index 46c246f83f462d3a6008948ffd513050ae9005a2..0000000000000000000000000000000000000000
--- a/Geant4/G4particles/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r2p1
diff --git a/Geant4/G4physics_lists/cmt/version.cmt b/Geant4/G4physics_lists/cmt/version.cmt
deleted file mode 100644
index ab6ce4246c17d78cb3283d681510b0456dda8c84..0000000000000000000000000000000000000000
--- a/Geant4/G4physics_lists/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v1r3
diff --git a/Geant4/G4processes/cmt/version.cmt b/Geant4/G4processes/cmt/version.cmt
deleted file mode 100644
index 816075e75955525518e4aca2a0415e2cff321971..0000000000000000000000000000000000000000
--- a/Geant4/G4processes/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v8r3p4
diff --git a/Geant4/G4readout/cmt/version.cmt b/Geant4/G4readout/cmt/version.cmt
deleted file mode 100644
index f6795f9cb8d602ab0d7c9fed773dde3cbccc44c7..0000000000000000000000000000000000000000
--- a/Geant4/G4readout/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r1p1
diff --git a/Geant4/G4run/cmt/version.cmt b/Geant4/G4run/cmt/version.cmt
deleted file mode 100644
index 3c20424588a10663a4a7f3376fc4129fdfc94e33..0000000000000000000000000000000000000000
--- a/Geant4/G4run/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4track/cmt/version.cmt b/Geant4/G4track/cmt/version.cmt
deleted file mode 100644
index 3c20424588a10663a4a7f3376fc4129fdfc94e33..0000000000000000000000000000000000000000
--- a/Geant4/G4track/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v5r1p1
diff --git a/Geant4/G4tracking/cmt/version.cmt b/Geant4/G4tracking/cmt/version.cmt
deleted file mode 100644
index e9e7e3a6c871b4906916e52093b8dca352001ce0..0000000000000000000000000000000000000000
--- a/Geant4/G4tracking/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v6r1p1
diff --git a/Geant4/G4useVisUI/cmt/version.cmt b/Geant4/G4useVisUI/cmt/version.cmt
deleted file mode 100644
index 93062f73bc67765eb5316d2ebccec5d6bdeb8e1c..0000000000000000000000000000000000000000
--- a/Geant4/G4useVisUI/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v3r1
diff --git a/Geant4/G4vis_management/cmt/version.cmt b/Geant4/G4vis_management/cmt/version.cmt
deleted file mode 100644
index 12e68ed64fb2fd06fba13a6a14ccc88aba955fd7..0000000000000000000000000000000000000000
--- a/Geant4/G4vis_management/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v4r2p1
diff --git a/Geant4Sys/cmt/version.cmt b/Geant4Sys/cmt/version.cmt
deleted file mode 100644
index b24857a4df1da1672d7fb38d80030afb29f6b2e5..0000000000000000000000000000000000000000
--- a/Geant4Sys/cmt/version.cmt
+++ /dev/null
@@ -1 +0,0 @@
-v95r2p8
diff --git a/Geant4Sys/doc/release.notes b/Geant4Sys/doc/release.notes
index 7a4cae1fb84100bfb4eb9a56167999fb16381fee..475c80c8c35773bd9fef146cfb21e849b881bc5f 100755
--- a/Geant4Sys/doc/release.notes
+++ b/Geant4Sys/doc/release.notes
@@ -7,8 +7,6 @@ Purpose            : LHCb build using cmt of Geant4
 !</PRE><H1><A NAME=v95r2p8>2015-02-04 Geant4Sys v95r2p8</A></H1><PRE>
 
 ! ======================= G4config v95r2p8 2015-02-04 ========================
- - on v95r2b branch
-
 ! 2015-01-26 - Marco Clemencic
  - Fixed LHCBGAUSS-389: Install Geant4 headers in InstallArea/$CMTCONFIG/include
 
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 46d73c68f3df6967e814db62956a2464090989fb..0000000000000000000000000000000000000000
--- a/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ${LBCONFIGURATIONROOT}/data/Makefile
diff --git a/cmt/project.cmt b/cmt/project.cmt
index 2874c13cf195188d730bdb9a455c782f71d321de..ee0340997679be1e30528d341ed31a175ee78be6 100755
--- a/cmt/project.cmt
+++ b/cmt/project.cmt
@@ -1,6 +1,6 @@
 project GEANT4
 
-use GAUDI	GAUDI_v25r6p1
+use GAUDI	GAUDI_v26r1
 use PARAM
 
 build_strategy	with_installarea
diff --git a/toolchain.cmake b/toolchain.cmake
index 9ac10a77543e64d6a3e6491ff92f692e7c993e7b..eb33c3b9aa89ac4df8701192042533f804716e80 100644
--- a/toolchain.cmake
+++ b/toolchain.cmake
@@ -1,5 +1,5 @@
 # Special wrapper to load the declared version of the heptools toolchain.
-set(heptools_version 71root6)
+set(heptools_version 74root6)
 
 find_file(use_heptools_module UseHEPTools.cmake
           HINTS ${CMAKE_CURRENT_SOURCE_DIR}/cmake)