diff --git a/External/GeoModel/CMakeLists.txt b/External/GeoModel/CMakeLists.txt
index 266dd0e326cc8d6ef1558d97fd3c4d20e61f8c91..8a354e667f6d7b4120a1255fdb94cf2e086a8f81 100644
--- a/External/GeoModel/CMakeLists.txt
+++ b/External/GeoModel/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package( ZLIB )
 
 # Declare where to get GeoModel from.
 set( ATLAS_GEOMODEL_SOURCE
-   "URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/5.3.0/GeoModel-5.3.0.tar.bz2;URL_MD5;69c41f2c12ada4d953b6452454f92a04"
+   "URL;https://gitlab.cern.ch/GeoModelDev/GeoModel/-/archive/6.0.0/GeoModel-6.0.0.tar.bz2;URL_MD5;3e239a848c7622fc894152e100bec27e"
    CACHE STRING "The source for GeoModel" )
 mark_as_advanced( ATLAS_GEOMODEL_SOURCE )
 
@@ -76,6 +76,7 @@ ExternalProject_Add( GeoModel
   CMAKE_CACHE_ARGS
   -DCMAKE_PREFIX_PATH:PATH=${_prefixPaths}
   -DCMAKE_CXX_STANDARD_INCLUDE_DIRECTORIES:PATH=${SQLite3_INCLUDE_DIR}
+  -DCMAKE_INSTALL_INCLUDEDIR:PATH=${CMAKE_INSTALL_INCLUDEDIR}/GeoModel
   -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
   -DCMAKE_INSTALL_PREFIX:PATH=${_buildDir}
   -DGEOMODEL_BUILD_TOOLS:BOOL=TRUE