diff --git a/cmake/toolchain/heptools-dev-generators.cmake b/cmake/toolchain/heptools-dev-generators.cmake
index e66b31af429325723a9eb445269f573459090f33..cd41ffdd468bd8719c294003f1eff5030032e66f 100644
--- a/cmake/toolchain/heptools-dev-generators.cmake
+++ b/cmake/toolchain/heptools-dev-generators.cmake
@@ -40,11 +40,9 @@ LCG_external_package(madgraph5amc      2.6.7          ${MCGENPATH}/madgraph5amc
 #LCG_external_package(lhapdf            6.1.6.cxxstd   ${MCGENPATH}/lhapdf author=6.1.6 usecxxstd=1 )
 LCG_external_package(lhapdf            6.2.3          ${MCGENPATH}/lhapdf       )
 
-if(((${LCG_COMP} MATCHES gcc) AND (${LCG_COMPVERS} LESS 9)) OR (${LCG_COMP} MATCHES clang))
 LCG_external_package(powheg-box-v2     r3043.lhcb    ${MCGENPATH}/powheg-box-v2 author=r3043  )
 #LCG_external_package(powheg-box-v2     r3043.lhcb.rdynamic    ${MCGENPATH}/powheg-box-v2 author=r3043  )
 #LCG_external_package(powheg-box        r2092         ${MCGENPATH}/powheg-box       )
-endif()
 
 LCG_external_package(feynhiggs         2.10.2         ${MCGENPATH}/feynhiggs	)
 LCG_external_package(chaplin           1.2            ${MCGENPATH}/chaplin      )
diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index c2f4f9aa59d8fa2f9cd74f00fd3d79b047f84287..e233d6928fc9e71a3373d6bec713cf569f397d05 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -2122,6 +2122,8 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
   BUILD_COMMAND ${MAKE} -j1
   IF <VERSION> MATCHES "rdynamic" THEN
     "OPT=-rdynamic -fPIE -fPIC -pie -O2" "DEBUG=-rdynamic -fPIE -fPIC -pie -O2"
+  ELSE
+    "OPT=-fautomatic -O2" "DEBUG=-fautomatic -O2"
   ENDIF
   INSTALL_COMMAND ${MAKE} install
   IF NOT CMAKE_BUILD_TYPE MATCHES Deb THEN
@@ -2129,6 +2131,7 @@ if(NOT APPLE)    #  (installation fails on MacOSX)
   ENDIF
   BUILD_IN_SOURCE 1
   DEPENDS fastjet lhapdf-<powheg-box-v2_<NATIVE_VERSION>_lhapdf> chaplin feynhiggs
+  REVISION 1
  )
 
 foreach(v ${powheg-box-v2_native_version})
diff --git a/generators/powheg-box-v2/files/Makefile b/generators/powheg-box-v2/files/Makefile
index 84e69567300fd2d71f8f23d7c7024243df9161bb..198c5f7e6120154a11e9ef15a78d8b6c7ec7b7a2 100644
--- a/generators/powheg-box-v2/files/Makefile
+++ b/generators/powheg-box-v2/files/Makefile
@@ -38,7 +38,7 @@ HJ HWJ VBF_H W W_ew-BMNNP WW Z_ew-BMNNPV HJJ HZ trijet W2jet Wgamma WZ Zj gg_H_2
 # dislepton-jet - takes ages to compile...(?)
 #
 
-all: mksetup mkbinaries
+all: mkbinaries
 
 mkbinaries: $(PROCESSES)
 
@@ -46,26 +46,6 @@ $(PROCESSES):
 	export PATH=${FASTJET}/bin:${LHAPDF}/bin:$${PATH} && \
 	cd $@ && $(MAKE) pwhg_main COMPILER=$(MYFC) CHAPLIN=$(CHAPLIN) FEYNHIGGS=$(FEYNHIGGS)
 
-mksetup:
-	( echo "#!/bin/sh" ; \
-	  echo "" ; \
-	  echo "# Source this script to setup environment (bash shell):" ; \
-	  echo "#   \$$ source $(PREFIX)/$(BINDIR)/setup.sh" ; \
-	  echo "" ; \
-	  echo "export PATH=$(PREFIX)/$(BINDIR):\$${PATH}" ; \
-	  echo "export LD_LIBRARY_PATH=$(FASTJET)/lib:$(shell $(LHAPDF)/bin/lhapdf-config --libdir):\$${LD_LIBRARY_PATH}" ; \
-	  echo "export LHAPATH=$(shell $(LHAPDF)/bin/lhapdf-config --pdfsets-path)" ; \
-	) > setup.sh
-	( echo "#!/bin/csh" ; \
-	  echo "" ; \
-	  echo "# Source this script to setup environment (csh shell):" ; \
-	  echo "#   \$$ source $(PREFIX)/$(BINDIR)/setup.csh" ; \
-	  echo "" ; \
-	  echo "setenv PATH $(PREFIX)/$(BINDIR):\$${PATH}" ; \
-	  echo "setenv LD_LIBRARY_PATH $(FASTJET)/lib:$(shell $(LHAPDF)/bin/lhapdf-config --libdir):\$${LD_LIBRARY_PATH}" ; \
-	  echo "setenv LHAPATH $(shell $(LHAPDF)/bin/lhapdf-config --pdfsets-path)" ; \
-	) > setup.csh
-
 # to copy documentation we use more complicated `find ... | xargs ...` way
 # instead of simple `cp` to avoid error
 #   "cp: will not overwrite just-created ..."
@@ -74,7 +54,6 @@ install:
 	for i in $(PROCESSES) ; do \
 	  cp -vf $$i/pwhg_main $(PREFIX)/$(BINDIR)/$$i || exit 1 ; \
 	done
-	cp -vf setup.sh setup.csh $(PREFIX)/$(BINDIR)/
 	mkdir -p $(DATADIR)/$(DOCDIR)
 	find . -name "*.pdf" -o -name "*.ps.gz" | xargs -I "{}" cp {} $(DATADIR)/$(DOCDIR)/
 
@@ -82,4 +61,3 @@ clean:
 	for i in $(PROCESSES) ; do \
 	  make -C $$i clean ; \
 	done
-	rm -f setup.sh setup.csh