--- PDF/LHAPDF.cc    2013-10-26 01:48:12.000000000 +0200
+++ PDF/LHAPDF.cc    2013-12-05 17:23:13.000000000 +0100
@@ -33,6 +33,7 @@
 #include "config.h"
 #include "ThePEG/Persistency/PersistentOStream.h"
 #include "ThePEG/Persistency/PersistentIStream.h"
+#include "stdlib.h"
 
 #ifdef ThePEG_HAS_FPU_CONTROL
 #include <fpu_control.h>
@@ -228,7 +229,12 @@
 
 std::string LHAPDF::getIndexPath() {
   // macro is passed in from -D compile flag
-  return std::string(LHAPDF_PKGDATADIR) + "/PDFsets.index";
+  char const* tmp = getenv( "LHAPATH" );
+  if ( tmp != NULL ) {
+    return std::string(getenv("LHAPATH")) + "/../PDFsets.index";
+  } else {
+    return std::string(LHAPDF_PKGDATADIR) + "/PDFsets.index";
+  };
 }
 
 bool LHAPDF::openLHAIndex(ifstream & is) {
--- ACDC/ACDCGen.h.orig	2014-04-02 16:20:59.000000000 +0200
+++ ACDC/ACDCGen.h	2014-04-02 16:22:40.000000000 +0200
@@ -13,6 +13,7 @@
 #include "ACDCTraits.h"
 #include "ACDCGenCell.h"
 #include "ThePEG/Utilities/Exception.h"
+#include <algorithm>
 
 namespace ACDCGenerator {