diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake
index 9eada22a1005f6c3f4ad36b2a6ade519da35a831..4f2f69be6f191a049d00d18d8403867ec2734528 100644
--- a/cmake/toolchain/heptools-dev-generators.cmake
+++ b/cmake/toolchain/heptools-dev-generators.cmake
@@ -134,6 +134,7 @@ LCG_external_package(sacrifice         0.9.9          ${MCGENPATH}/sacrifice pyt
 LCG_external_package(looptools         2.15           ${MCGENPATH}/looptools)
 LCG_external_package(looptools         2.8            ${MCGENPATH}/looptools)
 
+LCG_external_package(vbfnlo            3.0.0beta5     ${MCGENPATH}/vbfnlo feynhiggs=2.10.2 lhapdf=6.2.3 author=3.0.0beta5)
 LCG_external_package(vbfnlo            3.0.0beta4     ${MCGENPATH}/vbfnlo feynhiggs=2.10.2)
 LCG_external_package(vbfnlo            3.0.0beta2p1   ${MCGENPATH}/vbfnlo feynhiggs=2.8.6 lhapdf=6.2.1 author=3.0.0beta2)
 LCG_external_package(vbfnlo            3.0.0beta2p3   ${MCGENPATH}/vbfnlo feynhiggs=2.8.6 lhapdf=6.2.3 author=3.0.0beta2)
@@ -168,6 +169,7 @@ if (NOT (${LCG_TARGET} MATCHES "gcc49"))
   LCG_external_package(thepeg            2.2.0p3          ${MCGENPATH}/thepeg rivet=2.5.4 lhapdf=6.2.3 author=2.2.0)
   LCG_external_package(thepeg            2.2.1          ${MCGENPATH}/thepeg rivet=2.5.4)
   LCG_external_package(thepeg            2.2.1p3          ${MCGENPATH}/thepeg rivet=2.5.4 lhapdf=6.2.3 author=2.2.1)
+  LCG_external_package(thepeg            2.2.2          ${MCGENPATH}/thepeg rivet=2.5.4 lhapdf=6.2.3 author=2.2.2)
 endif()
 LCG_external_package(thepeg            2.0.4          ${MCGENPATH}/thepeg rivet=2.5.2)
 
@@ -190,6 +192,7 @@ if (NOT (${LCG_TARGET} MATCHES "gcc49"))
   LCG_external_package(herwig3         7.2.0p3        ${MCGENPATH}/herwig++  thepeg=2.2.0p3 madgraph=2.6.5p3.atlas3 openloops=2.0.0 lhapdf=6.2.3    gosam=2.0.4 vbfnlo=3.0.0beta2p3 author=7.2.0 syscalc=1.1.4p3)
   LCG_external_package(herwig3         7.2.1          ${MCGENPATH}/herwig++  thepeg=2.2.1   madgraph=2.5.5   openloops=1.3.1 lhapdf=6.2.0        gosam=2.0.4)
   LCG_external_package(herwig3         7.2.1p3        ${MCGENPATH}/herwig++  thepeg=2.2.1p3 madgraph=2.6.5p3.atlas3 openloops=2.0.0 lhapdf=6.2.3    gosam=2.0.4 vbfnlo=3.0.0beta2p3 author=7.2.1 syscalc=1.1.4p3)
+  LCG_external_package(herwig3         7.2.2        ${MCGENPATH}/herwig++  thepeg=2.2.2 madgraph=2.6.5p3.atlas3 openloops=2.1.2 lhapdf=6.2.3    gosam=2.0.4 vbfnlo=3.0.0beta5 author=7.2.2 syscalc=1.1.4p3)
 #  LCG_external_package(herwig3         7.2.1p4        ${MCGENPATH}/herwig++  thepeg=2.2.1p3 madgraph=2.6.5p3.atlas3 openloops=2.1.2 lhapdf=6.2.3    gosam=2.0.4 vbfnlo=3.0.0beta2p3 author=7.2.1 syscalc=1.1.4p3)
 endif()
 LCG_external_package(herwig3           7.0.4          ${MCGENPATH}/herwig++  thepeg=2.0.4 madgraph=2.4.2 openloops=1.3.1 lhapdf=6.1.6.cxxstd)
diff --git a/generators/patches/thepeg-2.2.2.patch b/generators/patches/thepeg-2.2.2.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0e2ff8a1430a4f229b557e306c55ed5cbcdaae00
--- /dev/null
+++ b/generators/patches/thepeg-2.2.2.patch
@@ -0,0 +1,15 @@
+--- m4/rivet.m4.orig	2013-10-16 10:50:05.000000000 +0200
++++ m4/rivet.m4	2017-08-02 12:26:22.897894696 +0200
+@@ -33,10 +33,7 @@
+ else
+ 	AC_MSG_RESULT([$with_rivet])
+ 	RIVETINCLUDE="$( $with_rivet/bin/rivet-config --cppflags )"
+-	RIVETLIBS="-L$with_rivet/lib -R$with_rivet/lib -lRivet"
+-	if test "${host_cpu}" == "x86_64" -a -e $with_rivet/lib64/libRivet.so ; then
+-	  RIVETLIBS="-L$with_rivet/lib64 -R$with_rivet/lib64 -lRivet"
+-	fi
++        RIVETLIBS="$( $with_rivet/bin/rivet-config --libs ) -lYODA"
+ fi
+ 
+ if test "x$with_rivet" != "xno"; then
+