diff --git a/generators/CMakeLists.txt b/generators/CMakeLists.txt
index c26106b4d9c806172c5303edeab1db2af34aaa06..d1a519dd3395479e116c938969a4dd460128702d 100644
--- a/generators/CMakeLists.txt
+++ b/generators/CMakeLists.txt
@@ -2807,12 +2807,12 @@ LCGPackage_Add(
   CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR>/tmppdfsets
             COMMAND ${lhapdf_home}/bin/lhapdf --pdfdir=<INSTALL_DIR>/tmppdfsets --listdir=${lhapdf_home}/share/LHAPDF install cteq6l1 CT10
 			# PATH=$PATH:${ocaml_home}/bin/ LCIO_DIR=${lcio_home}
-#             COMMAND $ENV{SHELL} -c "PATH=${libtool_home}/bin:$PATH ${autoconf_home}/bin/autoreconf --force --install"
+            COMMAND autoreconf --force --install
             COMMAND $ENV{SHELL} -c "LOOPTOOLS_DIR=${looptools_home}/lib64 LHAPDF_DATA_PATH=<INSTALL_DIR>/tmppdfsets HOPPET_DIR=${hoppet_home} LHAPDF_DIR=${lhapdf_home}  HEPMC_DIR=${HepMC_home} ./configure --enable-hepmc --enable-fastjet --with-fastjet=${fastjet_home} --enable-hoppet --enable-openloops --with-openloops=${openloops_home} --enable-gosam --with-gosam=${gosam_home} --with-golem=${gosam_contrib_home} --with-form=${FORM_home} --with-qgraf=${qgraf_home} --with-ninja=${gosam_contrib_home} --with-samurai=${gosam_contrib_home} --enable-looptools --disable-ocaml --prefix=<INSTALL_DIR> F77=$FC FCFLAGS=-ffree-line-length-0 FFLAGS=-ffree-line-length-0"
-  BUILD_COMMAND $ENV{SHELL} -c "LD_LIBRARY_PATH=${openloops_home}/lib:$LD_LIBRARY_PATH ${MAKE}"
+  BUILD_COMMAND ${MAKE}
   INSTALL_COMMAND ${MAKE} install
   BUILD_IN_SOURCE 1
-  DEPENDS lhapdf looptools openloops hoppet HepMC fastjet gosam gosam_contrib FORM qgraf autoconf automake libtool
+  DEPENDS lhapdf looptools openloops hoppet HepMC fastjet gosam gosam_contrib FORM qgraf IF <NATIVE_VERSION> VERSION_LESS 2.8.0 THEN autoconf automake ENDIF libtool
   # ocaml LCIO
 )
 
diff --git a/generators/patches/whizard-2.8.0.patch b/generators/patches/whizard-2.8.0.patch
new file mode 100644
index 0000000000000000000000000000000000000000..55fcc1cb16f7b9da7a5e5b4240e36ba16f04ba6d
--- /dev/null
+++ b/generators/patches/whizard-2.8.0.patch
@@ -0,0 +1,23 @@
+--- m4/lhapdf.m4.orig	2016-09-10 00:48:38.000000000 +0200
++++ m4/lhapdf.m4	2017-09-05 14:14:00.534875163 +0200
+@@ -42,7 +42,7 @@
+     AC_SUBST([LHAPDF_MAJOR_VERSION])
+ 
+     AC_MSG_CHECKING([the LHAPDF pdfsets path])
+-    LHAPDF_PDFSETS_PATH=`$LHAPDF_CONFIG --datadir`
++    LHAPDF_PDFSETS_PATH=$LHAPDF_DATA_PATH
+     AC_MSG_RESULT([$LHAPDF_PDFSETS_PATH])
+ 
+     AC_MSG_CHECKING([the standard PDF sets])
+--- configure.ac.orig	2017-09-05 14:12:19.674273540 +0200
++++ configure.ac	2017-09-05 14:12:44.990425658 +0200
+@@ -855,7 +855,7 @@
+ AC_CONFIG_FILES([src/system/Makefile])
+ 
+ AC_CONFIG_FILES([src/system/system_dependencies.f90], [
+-   maxlen=70
++   maxlen=255
+    i=1
+    pat=""
+    while test ${i} -lt ${maxlen}; do pat="${pat}."; i=`expr ${i} + 1`; done
+