diff --git a/Analysis/Makefile.am b/Analysis/Makefile.am
--- a/Analysis/Makefile.am
+++ b/Analysis/Makefile.am
@@ -1,67 +1,67 @@
 AIDAWRAPPERS = LWH/AIAnalysisFactory.h LWH/AIAxis.h LWH/AIHistogram1D.h LWH/AIHistogram2D.h \
                LWH/AIHistogramFactory.h LWH/AITree.h LWH/AITreeFactory.h \
                LWH/AIManagedObject.h LWH/AIDataPoint.h LWH/AIDataPointSet.h \
                LWH/AIDataPointSetFactory.h LWH/AIMeasurement.h
 
 LWHHEADERS = LWH/AnalysisFactory.h LWH/Axis.h LWH/Tree.h LWH/TreeFactory.h \
              LWH/Histogram1D.h LWH/Histogram2D.h LWH/HistogramFactory.h LWH/ManagedObject.h \
              LWH/VariAxis.h LWH/DataPoint.h LWH/DataPointSet.h LWH/DataPointSetFactory.h \
              LWH/Measurement.h
 
 mySOURCES = LWHFactory.cc
 
 pkglib_LTLIBRARIES = LWHFactory.la XSecCheck.la ProgressLog.la
 
 if HAVE_RIVET
   DOCFILES = RivetAnalysis.h NLORivetAnalysis.h
   pkglib_LTLIBRARIES += RivetAnalysis.la
   RivetAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(RIVETINCLUDE) $(HEPMCINCLUDE)
   RivetAnalysis_la_LIBADD = $(HEPMCLIBS) $(RIVETLIBS)
   RivetAnalysis_la_SOURCES = RivetAnalysis.cc NLORivetAnalysis.cc $(INCLUDEFILES)
-  RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 25:1:0
+  RivetAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 else
   DOCFILES = $(AIDAWRAPPERS) $(LWHHEADERS)
 endif
 DOCFILES += LWHFactory.h
 
 INCLUDEFILES = $(DOCFILES) 
 
 LWHINCLUDE = -I$(top_builddir)/include/ThePEG/Analysis/LWH
 
 LWHFactory_la_SOURCES = $(mySOURCES) $(INCLUDEFILES)
 LWHFactory_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 LWHFactory_la_CPPFLAGS = $(AM_CPPFLAGS) $(LWHINCLUDE)
 
 XSecCheck_la_SOURCES = XSecCheck.cc XSecCheck.h
 XSecCheck_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 
 ProgressLog_la_SOURCES = ProgressLog.cc ProgressLog.h
 ProgressLog_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 
 noinst_LTLIBRARIES = libThePEGHist.la
 libThePEGHist_la_SOURCES = \
   FactoryBase.cc FactoryBase.fh FactoryBase.h AIDA_helper.h
 libThePEGHist_la_CPPFLAGS = $(AM_CPPFLAGS) $(LWHINCLUDE)
 
 if HAVE_HEPMC
   pkglib_LTLIBRARIES += HepMCAnalysis.la
   HepMCAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
   HepMCAnalysis_la_SOURCES = HepMCFile.h    HepMCFile.cc    NLOHepMCFile.h    NLOHepMCFile.cc	HIHepMCFile.h HIHepMCFile.cc
   HepMCAnalysis_la_CPPFLAGS = $(AM_CPPFLAGS) $(HEPMCINCLUDE)
   HepMCAnalysis_la_LIBADD = $(HEPMCLIBS)
 endif
 
 pkglib_LTLIBRARIES += GraphvizPlot.la
 GraphvizPlot_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 GraphvizPlot_la_SOURCES = GraphvizPlot.h GraphvizPlot.cc
 
 LWH.tgz: $(AIDAWRAPPERS) $(LWHHEADERS)
 	tar czf LWH.tgz  $(AIDAWRAPPERS) $(LWHHEADERS)
 
 include $(top_srcdir)/Config/Makefile.aminclude
 
 
 
 
 
 
diff --git a/PDF/Makefile.am b/PDF/Makefile.am
--- a/PDF/Makefile.am
+++ b/PDF/Makefile.am
@@ -1,90 +1,90 @@
 mySOURCES = PartonExtractor.cc PDFBase.cc RemnantHandler.cc \
             BeamParticleData.cc PolarizedBeamParticleData.cc \
             PartonBin.cc NoPDF.cc NoRemnants.cc PDFCuts.cc \
             PartonBinInstance.cc SoftRemnantHandler.cc
 
 DOCFILES = BeamParticleData.h PolarizedBeamParticleData.h \
            NoPDF.h NoRemnants.h PDFBase.h PDFCuts.h \
            PartonBin.h PartonExtractor.h RemnantHandler.h \
            PDF.h PartonBinInstance.h SoftRemnantHandler.h
 
 INCLUDEFILES = $(DOCFILES) BeamParticleData.xh \
                PDFBase.xh PartonExtractor.fh \
                PartonExtractor.xh RemnantHandler.xh \
                PDF.fh PartonBin.fh PolarizedBeamParticleData.fh
 
 INPUTFILES = PDFsets.index
 
 CLEANFILES = .done-all-links
 
 noinst_LTLIBRARIES = libThePEGPDF.la
 pkglib_LTLIBRARIES = LeptonLeptonPDF.la UnResolvedRemnant.la \
           GRVBase.la GRV94L.la GRV94M.la WeizsackerWilliamsPDF.la \
           BudnevPDF.la
 
 if USELHAPDF
 pkglib_LTLIBRARIES += ThePEGLHAPDF.la
 LHAPDF_SOURCES = LHAPDF6.cc LHAPDF6.h
 
-ThePEGLHAPDF_la_LDFLAGS =  $(AM_LDFLAGS) $(LHAPDF_LDFLAGS) -module -version-info 25:1:0
+ThePEGLHAPDF_la_LDFLAGS =  $(AM_LDFLAGS) $(LHAPDF_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 ThePEGLHAPDF_la_LIBADD = $(LHAPDF_LIBS)
 ThePEGLHAPDF_la_SOURCES = $(LHAPDF_SOURCES)
 ThePEGLHAPDF_la_CPPFLAGS = $(AM_CPPFLAGS) $(LHAPDF_CPPFLAGS)
 endif
 
 libThePEGPDF_la_SOURCES = $(mySOURCES) $(INCLUDEFILES)
 libThePEGPDF_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 LeptonLeptonPDF_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 LeptonLeptonPDF_la_SOURCES = LeptonLeptonPDF.cc LeptonLeptonPDF.h
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 WeizsackerWilliamsPDF_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 WeizsackerWilliamsPDF_la_SOURCES = WeizsackerWilliamsPDF.cc WeizsackerWilliamsPDF.h
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 BudnevPDF_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 BudnevPDF_la_SOURCES = BudnevPDF.cc BudnevPDF.h
 
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 UnResolvedRemnant_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 UnResolvedRemnant_la_SOURCES = UnResolvedRemnant.cc UnResolvedRemnant.h
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 GRVBase_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 GRVBase_la_SOURCES = GRVBase.cc GRVBase.h
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 GRV94L_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 GRV94L_la_SOURCES = GRV94L.cc GRV94L.h
 
 # Version info should be updated if any interface or persistent I/O
 # function is changed
 GRV94M_la_LDFLAGS = $(AM_LDFLAGS) -module $(LIBTOOLVERSIONINFO)
 GRV94M_la_SOURCES = GRV94M.cc GRV94M.h
 
 dist_pkgdata_DATA = PDFsets.index
 
 all-local: .done-all-links
 
 .done-all-links:
 @EMPTY@ifdef SHOWCOMMAND
 	for file in $(INPUTFILES); do \
 	  if test ! -f $$file; then $(LN_S) $(srcdir)/$$file $$file; fi; done
 	echo "stamp" > .done-all-links
 @EMPTY@else
 	@echo "sym-linking input files files..."
 	@for file in $(INPUTFILES); do \
 	  if test ! -f $$file; then $(LN_S) $(srcdir)/$$file $$file; fi; done
 	@echo "stamp" > .done-all-links
 @EMPTY@endif
 
 include $(top_srcdir)/Config/Makefile.aminclude
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1,174 +1,174 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.59])
-AC_INIT([ThePEG],[2.1.4],[http://www.thep.lu.se/ThePEG/],[ThePEG])
+AC_INIT([ThePEG],[2.1.5],[http://www.thep.lu.se/ThePEG/],[ThePEG])
 AC_CONFIG_AUX_DIR([Config])
 AC_CONFIG_MACRO_DIR([m4])
 
-THEPEG_LIBTOOL_VERSION_INFO(28,0,0)
+THEPEG_LIBTOOL_VERSION_INFO(29,0,0)
 
 AC_CONFIG_SRCDIR([EventRecord/SubProcess.h])
 AC_CONFIG_HEADERS([Config/config.h])
 
 AC_CANONICAL_HOST
 
 case "${host}" in
   *-darwin[[0156]].*)
     AC_MSG_ERROR([ThePEG requires OS X 10.3 or later])
     ;;
   *-darwin7.*)
     if test "x$MACOSX_DEPLOYMENT_TARGET" != "x10.3"; then
        AC_MSG_ERROR(
        [Please export the MACOSX_DEPLOYMENT_TARGET variable, set to 10.3])
     fi
     ;;
 esac
 
 AC_LANG(C++)
 AM_INIT_AUTOMAKE([1.9 gnu dist-bzip2 subdir-objects -Wall])
 dnl also include std-options once --version and --help exist
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
 dnl Checks for C++ compiler. Handle C++11 flags.
 AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX([11],[noext],[mandatory])
 
 dnl check for unistd
 AC_CHECK_HEADER([unistd.h],[],
       [AC_MSG_ERROR([ThePEG needs "unistd.h". Check your system is POSIX-compliant.])])
 
 dnl Checks for programs.
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
 
 LT_PREREQ([2.2])
 LT_INIT([disable-static dlopen pic-only])
 
 VL_LIB_READLINE
 
 THEPEG_CHECK_GSL
 THEPEG_SEARCH_LHAPDF
 THEPEG_CHECK_HEPMC
 THEPEG_CHECK_RIVET
 FASTJET_CHECK_FASTJET
 
 AX_CHECK_ZLIB
 
 dnl AX_CHECK_BZ2LIB
 
 THEPEG_DEFINE_ENVDEFAULT(ThePEG_GZREAD_FILE,GZREAD_FILE,gunzip -c,[The command which, taking the name of a gzipped file as argument, unzips it and prints it to stdout. Default is "gunzip -c"])
 
 THEPEG_DEFINE_ENVDEFAULT(ThePEG_GZWRITE_FILE,GZWRITE_FILE,[gzip -c > ],[The command which, taking the name of a gzipped file as argument, reads stdin, zips it and writes it to the file. Default is "gzip -c > ".])
 
 THEPEG_DEFINE_ENVDEFAULT(ThePEG_BZ2READ_FILE,BZ2READ_FILE,bunzip2 -c,[The command which, taking the name of a bzipped file as argument, unzips it and prints it to stdout. Default is "bunzip2 -c".])
 
 THEPEG_DEFINE_ENVDEFAULT(ThePEG_BZ2WRITE_FILE,BZ2WRITE_FILE,[bzip2 -c > ],[The command which, taking the name of a bzipped file as argument, reads stdin, zips it and writes it to the file. Default is "bzip2 -c > ".])
 
 THEPEG_CHECK_EXPM1
 THEPEG_CHECK_LOG1P
 THEPEG_CHECK_DLOPEN
 
 AX_COMPILER_VENDOR
 case "${ax_cv_cxx_compiler_vendor}" in
     clang)
         case "${host}" in
             *linux*)
                 AC_MSG_WARN([
 *****************************************************************************
  clang/LLVM ignores the CPU floating-point environment.
  All floating point exception trapping will be disabled.
 *****************************************************************************])
                 ;;
         esac
 esac
 THEPEG_CHECK_FPUCONTROL
 THEPEG_CHECK_FENV
 
 AM_CPPFLAGS="-I\$(top_builddir)/include \$(GSLINCLUDE)"
 
 case "${ax_cv_cxx_compiler_vendor}" in
      gnu)
     AM_CXXFLAGS="-pedantic -Wall -W"
     ;;
      clang)
     AM_CXXFLAGS="-pedantic -Wall -Wno-overloaded-virtual -Wno-unused-function"
 dnl  -Wno-unneeded-internal-declaration
     ;;
      intel)
     AM_CXXFLAGS="-strict-ansi -Wall -wd13000,1418,981,444,383,1599,1572,2259,980"
     ;;
 esac
 
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 
 dnl do an actual capability check on ld instead of this workaround
 case "${host}" in
   *-darwin*)
      ;;
   *)
      AM_LDFLAGS="-Wl,--enable-new-dtags"
      ;;
 esac
 
 AC_SUBST(AM_LDFLAGS)
 
 THEPEG_EMPTY_SUBST
 
 AC_PATH_PROG(PERL, perl)
 
 AC_ARG_WITH(javagui,
             [  --with-javagui          Compile and install the java-based GUI.])
 
 if test "x$with_javagui" != "xno"; then
   THEPEG_HAS_JAVA([1.4], [], [with_javagui=no; AC_MSG_NOTICE([Java GUI disabled])])
 fi
 
 AM_CONDITIONAL([JAVAGUI], [test "x$with_javagui" != "xno"])
 
 AC_CONFIG_FILES([Helicity/Makefile
 Helicity/WaveFunction/Makefile
 Helicity/Vertex/Makefile
 Helicity/Vertex/Scalar/Makefile
 Helicity/Vertex/Vector/Makefile
 Helicity/Vertex/Tensor/Makefile
 Utilities/Makefile
 include/Makefile
 Interface/Makefile
 LesHouches/Makefile
 Vectors/Makefile
 PDT/Makefile
 PDF/Makefile
 Persistency/Makefile
 Config/Makefile
 Handlers/Makefile
 MatrixElement/Makefile
 Pointer/Makefile
 lib/Makefile
 lib/Makefile.common.install
 src/Makefile
 ACDC/Makefile
 Repository/Makefile
 EventRecord/Makefile
 StandardModel/Makefile
 Cuts/Makefile
 Analysis/Makefile
 Doc/Makefile
 Doc/MakeDocs.in
 Doc/refman.h
 Doc/refman.conf
 java/Makefile
 Makefile])
 AC_CONFIG_FILES([Doc/fixinterfaces.pl],[chmod +x Doc/fixinterfaces.pl])
 
 BOOST_REQUIRE([1.41],[AC_SUBST([BOOST_NOT_FOUND],[true])])
 BOOST_TEST()
 THEPEG_BOOST_UNIT_TEST
 
 THEPEG_OVERVIEW
 
 AC_CONFIG_COMMANDS([summary],[cat config.thepeg])
 
 AC_OUTPUT