diff --git a/Generators/Rivet_i/CMakeLists.txt b/Generators/Rivet_i/CMakeLists.txt
index c018ff34c60f1fe4c889e9b8048e03cc51428d23..c347c15e1ed392cefc6b4952766a5a54b77ff8df 100644
--- a/Generators/Rivet_i/CMakeLists.txt
+++ b/Generators/Rivet_i/CMakeLists.txt
@@ -40,3 +40,9 @@ atlas_add_component( Rivet_i
                      INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${ROOT_INCLUDE_DIRS} ${HEPMC_INCLUDE_DIRS} ${YODA_INCLUDE_DIRS} ${FASTJET_INCLUDE_DIRS} ${RIVET_INCLUDE_DIRS} ${GSL_INCLUDE_DIRS}
                      LINK_LIBRARIES ${Boost_LIBRARIES} ${GSL_LIBRARIES} ${ROOT_LIBRARIES} ${HEPMC_LIBRARIES} ${YODA_LIBRARIES} ${FASTJET_LIBRARIES} ${RIVET_LIBRARIES} AthenaBaseComps GaudiKernel AthenaKernel GeneratorObjects PathResolver Rivet_iLib )
 
+atlas_install_scripts(share/*.sh)
+
+set( RivetEnvironment_DIR ${CMAKE_CURRENT_SOURCE_DIR}
+   CACHE PATH "Location of RivetEnvironment.cmake" )
+find_package( RivetEnvironment )
+
diff --git a/Generators/Rivet_i/RivetEnvironmentConfig.cmake b/Generators/Rivet_i/RivetEnvironmentConfig.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..69da671ca4493f760c3a30135bfe2b7870ff5418
--- /dev/null
+++ b/Generators/Rivet_i/RivetEnvironmentConfig.cmake
@@ -0,0 +1,23 @@
+# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+#
+# This module is used to set up the environment for Rivet
+# 
+#
+
+# Set the environment variable(s):
+find_package( Rivet )
+find_package( YODA )
+
+if( RIVET_FOUND AND YODA_FOUND )
+  get_filename_component( _rivetPath "${RIVET_ROOT}" DIRECTORY )
+  set( RIVETENVIRONMENT_ENVIRONMENT 
+        FORCESET RIVETVER ${RIVET_VERSION} 
+        FORCESET YODAVER ${YODA_VERSION}
+        FORCESET RIVET_PATH ${_rivetPath}/${LCG_PLATFORM})
+  unset( _rivetPath )
+endif()
+
+# Silently declare the module found:
+set( RIVETENVIRONMENT_FOUND TRUE )
+
+
diff --git a/Generators/Rivet_i/share/setupRivet.sh b/Generators/Rivet_i/share/setupRivet.sh
new file mode 100644
index 0000000000000000000000000000000000000000..9c1f0701f708d3e5a89545f0976fc8f23ce645a8
--- /dev/null
+++ b/Generators/Rivet_i/share/setupRivet.sh
@@ -0,0 +1,2 @@
+source ${RIVET_PATH}/rivetenv.sh
+