diff --git a/autogen.sh b/autogen.sh
index 45b24713..2daf4fc5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -23,7 +23,10 @@
 PATHTOAUTOCONF=$(which autoconf)
 PATHTOAUTOMAKE=$(which automake)
 PATHTOLIBTOOL=$(which libtoolize)
-PATHTOGLIBTOOL=$(which glibtoolize)
+PATHTOGLIBTOOL=
+if [ "$PATHTOLIBTOOL" = "" ]; then
+  PATHTOGLIBTOOL=$(which glibtoolize)
+fi
 
 if [ "$PATHTOAUTOCONF" = "" ]; then
   echo
diff --git a/configure.ac b/configure.ac
index b9442be6..b326e346 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,8 @@
 AC_PREREQ(2.59)
 AC_INIT(musrfit, 0.6.0, andreas.suter@psi.ch)
 AC_CONFIG_AUX_DIR(admin)
+AC_CANONICAL_HOST
+#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}])
 
 dnl -----------------------------------------------
 dnl Package names and version numbers
@@ -12,6 +14,11 @@ LEM_LIBRARY_NAME=TLemRunHeader
 PSIBIN_LIBRARY_NAME=Class_MuSR_PSI
 MUD_LIBRARY_NAME=mud
 
+dnl -----------------------------------------------
+dnl Optional plug-ins
+dnl -----------------------------------------------
+
+
 #release versioning
 MUSR_MAJOR_VERSION=0
 MUSR_MINOR_VERSION=6
@@ -32,6 +39,11 @@ MUD_MAJOR_VERSION=0
 MUD_MINOR_VERSION=0
 MUD_MICRO_VERSION=0
 
+#release versioning
+PLUGIN_MAJOR_VERSION=0
+PLUGIN_MINOR_VERSION=0
+PLUGIN_MICRO_VERSION=0
+
 #API version
 MUSR_API_VERSION=MUSR_MAJOR_VERSION.MUSR_MINOR_VERSION
 AC_SUBST(MUSR_API_VERSION)
@@ -45,7 +57,11 @@ AC_SUBST(PSIBIN_API_VERSION)
 MUD_API_VERSION=MUD_MAJOR_VERSION.MUD_MINOR_VERSION
 AC_SUBST(MUD_API_VERSION)
 
+PLUGIN_API_VERSION=PLUGIN_MAJOR_VERSION.PLUGIN_MINOR_VERSION
+AC_SUBST(PLUGIN_API_VERSION)
+
 #shared library versioning
+PLUGIN_LIBRARY_VERSION=1:0:0
 LEM_LIBRARY_VERSION=1:5:0
 PSIBIN_LIBRARY_VERSION=0:0:0
 MUD_LIBRARY_VERSION=0:0:0
@@ -66,6 +82,7 @@ AC_SUBST(MUSR_LIBRARY_VERSION)
 AC_SUBST(LEM_LIBRARY_VERSION)
 AC_SUBST(PSIBIN_LIBRARY_VERSION)
 AC_SUBST(MUD_LIBRARY_VERSION)
+AC_SUBST(PLUGIN_LIBRARY_VERSION)
 
 PACKAGE=$MUSR_PROGRAM_NAME
 AC_SUBST(MUSR_LIBRARY_NAME)
@@ -93,6 +110,11 @@ MUSR_RELEASE=$MUSR_MAJOR_VERSION.$MUSR_MINOR_VERSION
 AC_SUBST(MUSR_RELEASE)
 AC_SUBST(MUSR_VERSION)
 
+PLUGIN_VERSION=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION.$PLUGIN_MICRO_VERSION
+PLUGIN_RELEASE=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION
+AC_SUBST(PLUGIN_RELEASE)
+AC_SUBST(PLUGIN_VERSION)
+
 VERSION=$MUSR_VERSION
 
 dnl -----------------------------------------------
@@ -106,7 +128,7 @@ AC_LANG(C++)
 # Checks for programs.
 # AC_PROG_AWK
 AC_PROG_CXX
-# AC_PROG_CC
+AC_PROG_CC
 # AC_PROG_LEX
 AC_PROG_LN_S
 # AC_PROG_YACC
@@ -115,7 +137,7 @@ AM_PROG_LIBTOOL
 ROOT_PATH
 
 dnl -----------------------------------------------
-dnl Ask user for path to fftw3 stuff
+dnl Ask user for path to fftw3
 dnl -----------------------------------------------
 
 FFTW3_FOUND=0
@@ -160,7 +182,7 @@ AC_SUBST(FFTW3_CFLAGS)
 
 
 dnl -----------------------------------------------
-dnl Ask user for path to gsl stuff
+dnl Ask user for path to gsl
 dnl -----------------------------------------------
 
 GSL_FOUND=0
@@ -205,7 +227,7 @@ AC_SUBST(GSL_CFLAGS)
 
 
 dnl -----------------------------------------------
-dnl Ask user for path to boost stuff
+dnl Ask user for path to boost
 dnl -----------------------------------------------
 
 BOOST_FOUND=0
@@ -266,35 +288,97 @@ AC_CHECK_FILE([${ROOTINCDIR}/../include/Minuit2/MnMinimize.h], AC_MSG_RESULT([Mi
   AC_MSG_WARN([Minuit2 headers not found... Please check!]))
 
 
+dnl -----------------------------------------------
+dnl Ask user if BMWlibs should be built and where to find the CUBA installation
+dnl -----------------------------------------------
+
+AC_ARG_ENABLE([BMWlibs], [AC_HELP_STRING([--enable-BMWlibs],[build optional BMW plug-ins (default: disabled)])],
+    [CUBA_FOUND=0
+    AC_ARG_WITH([cuba],
+        [AC_HELP_STRING([--with-cuba],[prefix of CUBA installation, e.g. /usr/local or /usr])],
+        [CUBA_PREFIX=$with_cuba
+        if !(test -r ${CUBA_PREFIX}/include/cuba.h); then
+          AC_MSG_ERROR(CUBA cannot be found at the specified path!)
+        fi
+        AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation...])],
+        [PKG_CHECK_MODULES(CUBA, cuba >= 1.6, [CUBA_FOUND=1],
+          [if test -r /usr/local/include/cuba.h; then
+            CUBA_PREFIX="/usr/local"
+            AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)])
+          elif test -r /usr/include/cuba.h; then
+            CUBA_PREFIX="/usr"
+            AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)])
+          elif test -r /sw/include/cuba.h; then
+            CUBA_PREFIX="/sw"
+            AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)])
+          elif test -r /opt/local/include/cuba.h; then
+            CUBA_PREFIX="/opt/local"
+            AC_MSG_RESULT([using ${CUBA_PREFIX} as prefix of the CUBA installation... (ignore the negative check result just above)])
+          else
+            AC_MSG_ERROR(
+            [CUBA not found. Please call configure with the --with-cuba option.
+            This tells configure where to find the CUBA C library and header,
+            e.g. --with-cuba=/usr/local or --with-cuba=/usr]
+            )
+          fi
+        ]
+      )
+      ]
+    )
+    AC_SUBST(CUBA_PREFIX)
+    if test "${CUBA_FOUND}" != "1"; then
+      CUBA_LIBS="-L${CUBA_PREFIX}/lib -lcuba -lm"
+      CUBA_CFLAGS="-I${CUBA_PREFIX}/include"
+    fi
+    AC_SUBST(CUBA_LIBS)
+    AC_SUBST(CUBA_CFLAGS)
+    BUILD_BMW_LIBS=1
+    ],
+    [BUILD_BMW_LIBS=0]
+)
+
+dnl -----------------------------------------------
+dnl Ask user if ASlibs should be built
+dnl -----------------------------------------------
+
+AC_ARG_ENABLE([ASlibs], [AC_HELP_STRING([--enable-ASlibs],[build optional AS plug-ins (default: disabled)])],[BUILD_AS_LIBS=1], [BUILD_AS_LIBS=0])
+
 dnl -----------------------------------------------
 dnl Set some paths and flags for PMusr, TLemRunHeader, Class_MuSR_PSI and mud
 dnl -----------------------------------------------
 
-SRCDIR="$(pwd)"
+SRCDIR="$(pwd)/src"
 
-PSIBIN_SRCDIR="${SRCDIR}/src/external/MuSR_software/Class_MuSR_PSI"
-PSIBIN_LIBS="-L${PSIBIN_SRCDIR} -l${PSIBIN_LIBRARY_NAME}"
+PSIBIN_SRCDIR="${SRCDIR}/external/MuSR_software/Class_MuSR_PSI"
+PSIBIN_LIBS="${PSIBIN_SRCDIR}/lib${PSIBIN_LIBRARY_NAME}.la"
 PSIBIN_CFLAGS="-I${PSIBIN_SRCDIR}"
 AC_SUBST(PSIBIN_LIBS)
 AC_SUBST(PSIBIN_CFLAGS)
 
-MUD_SRCDIR="${SRCDIR}/src/external/mud/src"
-MUD_LIBS="-L${MUD_SRCDIR} -l${MUD_LIBRARY_NAME}"
+MUD_SRCDIR="${SRCDIR}/external/mud/src"
+MUD_LIBS="${MUD_SRCDIR}/lib${MUD_LIBRARY_NAME}.la"
 MUD_CFLAGS="-I${MUD_SRCDIR}"
 AC_SUBST(MUD_LIBS)
 AC_SUBST(MUD_CFLAGS)
 
-LEM_SRCDIR="${SRCDIR}/src/external/TLemRunHeader"
-LEM_LIBS="-L${LEM_SRCDIR} -l${LEM_LIBRARY_NAME}"
+LEM_SRCDIR="${SRCDIR}/external/TLemRunHeader"
+LEM_LIBS="${LEM_SRCDIR}/lib${LEM_LIBRARY_NAME}.la"
 LEM_CFLAGS="-I${LEM_SRCDIR}"
 AC_SUBST(LEM_LIBS)
 AC_SUBST(LEM_CFLAGS)
 
-PMUSR_LIBS="-L${SRCDIR}/src/classes -l${MUSR_LIBRARY_NAME}"
-PMUSR_CFLAGS="-I${SRCDIR}/src/include"
+PMUSR_LIBS="${SRCDIR}/classes/lib${MUSR_LIBRARY_NAME}.la"
+PMUSR_CFLAGS="-I${SRCDIR}/include"
 AC_SUBST(PMUSR_LIBS)
 AC_SUBST(PMUSR_CFLAGS)
 
+if test "${BUILD_BMW_LIBS}" -eq 1; then
+  TFITPOFB_SRCDIR="${SRCDIR}/external/TFitPofB-lib"
+  TFITPOFB_LIBS="${TFITPOFB_SRCDIR}/classes/libTFitPofB.la"
+  TFITPOFB_CFLAGS="-I${TFITPOFB_SRCDIR}/include"
+  AC_SUBST(TFITPOFB_LIBS)
+  AC_SUBST(TFITPOFB_CFLAGS)
+fi
 
 dnl -----------------------------------------------
 dnl Set host specific compiler and linker flags
@@ -364,7 +448,20 @@ AC_CONFIG_FILES([Makefile \
                  src/external/MuSR_software/Makefile \
                  src/external/MuSR_software/Class_MuSR_PSI/Makefile \
                  src/external/MuSR_software/Class_MuSR_PSI/Class_MuSR_PSI.pc \
-		 src/external/mud/Makefile \
-		 src/external/mud/src/Makefile \
-		 src/external/mud/src/mud.pc])
+                 src/external/mud/Makefile \
+                 src/external/mud/src/Makefile \
+                 src/external/mud/src/mud.pc])
+
+if test "${BUILD_BMW_LIBS}" -eq 1; then
+  AC_CONFIG_FILES([src/external/TFitPofB-lib/Makefile \
+                 src/external/TFitPofB-lib/classes/Makefile \
+                 src/external/libLFRelaxation/Makefile \
+                 src/external/libGapIntegrals/Makefile \
+                 src/external/libCalcMeanFieldsLEM/Makefile])
+fi
+
+if test "${BUILD_AS_LIBS}" -eq 1; then
+  AC_CONFIG_FILES([src/external/Nonlocal/Makefile])
+fi
+
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b9fe630..8182eda4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,10 @@
 ## Process this file with automake to create Makefile.in
 
-SUBDIRS = external classes
+SUBDIRS = external/TLemRunHeader \
+          external/MuSR_software \
+          external/mud \
+          classes \
+          external
 
 bin_PROGRAMS = musrfit musrview musrt0 musrparam msr2msr msr2data
 musrfit_SOURCES = musrfit.cpp
@@ -13,10 +17,10 @@ msr2data_SOURCES = msr2data.cpp
 xmldir = $(bindir)
 xml_DATA = musrfit_startup.xml
 
-LIBADD = $(PMUSR_LIBS) $(LEM_LIBS)
+LIBADD = $(PMUSR_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS)
 
 AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS)
 AM_LDFLAGS = $(LOCAL_BIN_LDFLAGS)
 INCLUDES = $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS)
-LIBS = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
+LIBS = $(PMUSR_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
 
diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am
index 79f4dac9..e9480f77 100644
--- a/src/classes/Makefile.am
+++ b/src/classes/Makefile.am
@@ -79,7 +79,7 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core
 lib_LTLIBRARIES = libPMusr.la
 
 libPMusr_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
-libPMusr_la_LIBADD = $(PSIBIN_LIBS) $(MUD_LIBS) $(LEM_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
+libPMusr_la_LIBADD = $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS)
 libPMusr_la_LDFLAGS = -version-info $(MUSR_LIBRARY_VERSION) -release $(MUSR_RELEASE) $(AM_LDFLAGS)
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/src/external/Makefile.am b/src/external/Makefile.am
index 0ef60a08..264e1c7f 100644
--- a/src/external/Makefile.am
+++ b/src/external/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = TLemRunHeader MuSR_software mud
+SUBDIRS = TFitPofB-lib \
+          libLFRelaxation \
+          libGapIntegrals \
+          libCalcMeanFieldsLEM \
+          Nonlocal
diff --git a/src/external/Nonlocal/Makefile b/src/external/Nonlocal/Makefile
deleted file mode 100644
index b20d6939..00000000
--- a/src/external/Nonlocal/Makefile
+++ /dev/null
@@ -1,107 +0,0 @@
-#---------------------------------------------------
-# Makefile
-#
-# Author: Andreas Suter
-# e-mail: andreas.suter@psi.ch
-#
-# $Id$
-#
-#---------------------------------------------------
-
-#---------------------------------------------------
-# get compilation and library flags from root-config
-
-ROOTCFLAGS    = $(shell $(ROOTSYS)/bin/root-config --cflags)
-ROOTLIBS      = $(shell $(ROOTSYS)/bin/root-config --libs)
-ROOTGLIBS     = $(shell $(ROOTSYS)/bin/root-config --glibs)
-
-#---------------------------------------------------
-# depending on the architecture, choose the compiler,
-# linker, and the flags to use
-#
-
-OSTYPE = $(shell uname)
-
-ifeq ($(OSTYPE),Linux)
-OS = LINUX
-endif
-ifeq ($(OSTYPE),Linux-gnu)
-OS = LINUX
-endif
-ifeq ($(OSTYPE),darwin)
-OS = DARWIN
-endif
-
-# -- Linux
-ifeq ($(OS),LINUX)
-CXX           = g++
-CXXFLAGS      = -Wall -Wno-trigraphs -fPIC
-INCLUDES      = -I../include
-LD            = g++
-LDFLAGS       = -g
-SOFLAGS       = -O -shared
-endif
-
-# -- Darwin
-ifeq ($(OS),DARWIN)
-CXX           = g++
-CXXFLAGS      = -Wall -Wno-trigraphs -fPIC
-INCLUDES      = -I../include
-LD            = g++
-LDFLAGS       = -g
-SOFLAGS       = -dynamic
-endif
-
-# the output from the root-config script:
-CXXFLAGS      += $(ROOTCFLAGS)
-LDFLAGS       +=
-
-# the ROOT libraries (G = graphic)
-LIBS          = $(ROOTLIBS) -lXMLParser
-GLIBS         = $(ROOTGLIBS) -lXMLParser
-
-# some definitions: headers (used to generate *Dict* stuff), sources, objects,...
-OBJS =
-OBJS += PNL_StartupHandler.o PNL_StartupHandlerDict.o
-OBJS += PNL_RgeHandler.o
-OBJS += PNL_PippardFitter.o PNL_PippardFitterDict.o
-
-SHLIB = libPNL_PippardFitter.so
-
-# make the shared lib:
-#
-all:  $(SHLIB)
-
-$(SHLIB): $(OBJS)
-	@echo "---> Building shared library $(SHLIB) ..."
-	/bin/rm -f $(SHLIB)
-	$(LD) $(OBJS) $(SOFLAGS) -o $(SHLIB) $(LIBS)
-	@echo "done"
-
-# clean up: remove all object file (and core files)
-# semicolon needed to tell make there is no source
-# for this target!
-#
-clean:; 	@rm -f $(OBJS) *Dict* core*
-	@echo "---> removing $(OBJS)"
-
-#
-$(OBJS): %.o: %.cpp
-	$(CXX) $(INCLUDES) $(CXXFLAGS) -c $<
-
-PNL_StartupHandlerDict.cpp: PNL_StartupHandler.h PNL_StartupHandlerLinkDef.h
-	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p $^
-
-PNL_PippardFitterDict.cpp: PNL_PippardFitter.h PNL_PippardFitterLinkDef.h
-	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p $^
-	
-install: all
-	@echo "Installing shared lib: libPUserFcn.so ( you must be root ;-) )"
-ifeq ($(OS),LINUX)
-	cp -pv $(SHLIB) $(ROOTSYS)/lib
-#	cp -pv PNonlocal.h $(ROOTSYS)/include
-#	cp -pv PNL_StartupHandler.h $(ROOTSYS)/include
-	cp -pv PNL_PippardFitter.h $(ROOTSYS)/include
-endif
diff --git a/src/external/Nonlocal/Makefile.am b/src/external/Nonlocal/Makefile.am
new file mode 100644
index 00000000..f9dc8690
--- /dev/null
+++ b/src/external/Nonlocal/Makefile.am
@@ -0,0 +1,48 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = \
+  PNL_PippardFitter.h \
+  PNL_RgeHandler.h \
+  PNL_StartupHandler.h \
+  PNonlocal.h
+
+h_linkdef = \
+  PNL_PippardFitterLinkDef.h \
+  PNL_StartupHandlerLinkDef.h
+
+dict_h_sources = \
+  PNL_PippardFitterDict.h \
+  PNL_StartupHandlerDict.h
+
+cpp_sources = \
+  PNL_PippardFitter.cpp \
+  PNL_RgeHandler.cpp \
+  PNL_StartupHandler.cpp
+
+dict_cpp_sources = \
+  PNL_PippardFitterDict.cpp \
+  PNL_StartupHandlerDict.cpp
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+INCLUDES = -I$(top_srcdir)/src/include -I../include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(ROOT_CFLAGS)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+
+lib_LTLIBRARIES = libPNL_PippardFitter.la
+
+libPNL_PippardFitter_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libPNL_PippardFitter_la_LIBADD = $(PMUSR_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS)
+libPNL_PippardFitter_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
+
+## For the moment do not build pkgconfig files for musrfit plug-ins...
+## pkgconfigdir = $(libdir)/pkgconfig
+## pkgconfig_DATA = PNL_PippardFitter.pc
+
diff --git a/src/external/TFitPofB-lib/Makefile.am b/src/external/TFitPofB-lib/Makefile.am
new file mode 100644
index 00000000..be500d10
--- /dev/null
+++ b/src/external/TFitPofB-lib/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = classes
diff --git a/src/external/TFitPofB-lib/classes/Makefile.am b/src/external/TFitPofB-lib/classes/Makefile.am
new file mode 100644
index 00000000..66d902bb
--- /dev/null
+++ b/src/external/TFitPofB-lib/classes/Makefile.am
@@ -0,0 +1,65 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = \
+  ../include/TBofZCalc.h \
+  ../include/TBulkTriVortexFieldCalc.h \
+  ../include/TFitPofBStartupHandler.h \
+  ../include/TLondon1D.h \
+  ../include/TPofBCalc.h \
+  ../include/TPofTCalc.h \
+  ../include/TSkewedGss.h \
+  ../include/TTrimSPDataHandler.h \
+  ../include/TVortex.h
+
+h_linkdef = \
+  ../include/TFitPofBStartupHandlerLinkDef.h \
+  ../include/TLondon1DLinkDef.h \
+  ../include/TVortexLinkDef.h \
+  ../include/TSkewedGssLinkDef.h
+
+dict_h_sources = \
+  TFitPofBStartupHandlerDict.h \
+  TLondon1DDict.h \
+  TSkewedGssDict.h \
+  TVortexDict.h
+
+cpp_sources = \
+  TBulkTriVortexFieldCalc.cpp \
+  TBofZCalc.cpp \
+  TFitPofBStartupHandler.cpp \
+  TLondon1D.cpp \
+  TPofBCalc.cpp \
+  TPofTCalc.cpp \
+  TSkewedGss.cpp \
+  TTrimSPDataHandler.cpp \
+  TVortex.cpp
+
+dict_cpp_sources = \
+  TFitPofBStartupHandlerDict.cpp \
+  TLondon1DDict.cpp \
+  TSkewedGssDict.cpp \
+  TVortexDict.cpp
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+INCLUDES = -I$(top_srcdir)/src/include -I../include $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(ROOT_CFLAGS)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+
+lib_LTLIBRARIES = libTFitPofB.la
+
+libTFitPofB_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libTFitPofB_la_LIBADD = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS)
+libTFitPofB_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
+
+## For the moment do not build pkgconfig files for musrfit plug-ins...
+## pkgconfigdir = $(libdir)/pkgconfig
+## pkgconfig_DATA = PTFitPofB.pc
+
diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am
new file mode 100644
index 00000000..d30ab6f1
--- /dev/null
+++ b/src/external/libCalcMeanFieldsLEM/Makefile.am
@@ -0,0 +1,40 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = \
+  TCalcMeanFieldsLEM.h
+
+h_linkdef = \
+  TCalcMeanFieldsLEMLinkDef.h
+
+dict_h_sources = \
+  TCalcMeanFieldsLEMDict.h
+
+cpp_sources = \
+  TCalcMeanFieldsLEM.cpp
+
+dict_cpp_sources = \
+  TCalcMeanFieldsLEMDict.cpp
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+INCLUDES = -I$(top_srcdir)/src/include $(TFITPOFB_CFLAGS) $(PMUSR_CFLAGS) $(ROOT_CFLAGS)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+
+lib_LTLIBRARIES = libCalcMeanFieldsLEM.la
+
+libCalcMeanFieldsLEM_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libCalcMeanFieldsLEM_la_LIBADD = $(TFITPOFB_LIBS) $(PMUSR_LIBS) $(ROOT_LIBS)
+libCalcMeanFieldsLEM_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
+
+## For the moment do not build pkgconfig files for musrfit plug-ins...
+## pkgconfigdir = $(libdir)/pkgconfig
+## pkgconfig_DATA = CalcMeanFieldsLEM.pc
+
diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am
new file mode 100644
index 00000000..a22b0ccc
--- /dev/null
+++ b/src/external/libGapIntegrals/Makefile.am
@@ -0,0 +1,42 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = \
+  TGapIntegrals.h \
+  ../BMWIntegrator/BMWIntegrator.h
+
+h_linkdef = \
+  TGapIntegralsLinkDef.h
+
+dict_h_sources = \
+  TGapIntegralsDict.h
+
+cpp_sources = \
+  TGapIntegrals.cpp \
+  ../BMWIntegrator/BMWIntegrator.cpp
+
+dict_cpp_sources = \
+  TGapIntegralsDict.cpp
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+INCLUDES = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+
+lib_LTLIBRARIES = libGapIntegrals.la
+
+libGapIntegrals_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libGapIntegrals_la_LIBADD = $(PMUSR_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS)
+libGapIntegrals_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
+
+## For the moment do not build pkgconfig files for musrfit plug-ins...
+## pkgconfigdir = $(libdir)/pkgconfig
+## pkgconfig_DATA = GapIntegrals.pc
+
diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am
new file mode 100644
index 00000000..4c199220
--- /dev/null
+++ b/src/external/libLFRelaxation/Makefile.am
@@ -0,0 +1,42 @@
+## Process this file with automake to create Makefile.in
+
+h_sources = \
+  TLFRelaxation.h \
+  ../BMWIntegrator/BMWIntegrator.h
+
+h_linkdef = \
+  TLFRelaxationLinkDef.h
+
+dict_h_sources = \
+  TLFRelaxationDict.h
+
+cpp_sources = \
+  TLFRelaxation.cpp \
+  ../BMWIntegrator/BMWIntegrator.cpp
+
+dict_cpp_sources = \
+  TLFRelaxationDict.cpp
+
+include_HEADERS = $(h_sources)
+noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
+
+INCLUDES = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS)
+AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
+
+BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
+AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
+CLEANFILES = *Dict.cpp *Dict.h *~ core
+
+%Dict.cpp %Dict.h: %.h %LinkDef.h
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+
+lib_LTLIBRARIES = libLFRelaxation.la
+
+libLFRelaxation_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
+libLFRelaxation_la_LIBADD = $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS)
+libLFRelaxation_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
+
+## For the moment do not build pkgconfig files for musrfit plug-ins...
+## pkgconfigdir = $(libdir)/pkgconfig
+## pkgconfig_DATA = LFRelaxation.pc
+