diff --git a/configure.ac b/configure.ac
index 4b61e771..0c219f42 100644
--- a/configure.ac
+++ b/configure.ac
@@ -786,6 +786,14 @@ if test "${PNEXUS_ENABLED}" = "1"; then
   AC_SUBST(PNEXUS_CXXFLAGS)
 fi
 
+if test "${BUILD_BNMR_LIBS}" = "1"; then
+  BNMRLIBS_SRCDIR="${SRCDIR}/external/libBNMR"
+  BNMRLIBS_LIBS="${BNMRLIBS_SRCDIR}/libBNMR.la"
+  BNMRLIBS_CFLAGS="-I${BNMRLIBS_SRCDIR}"
+  AC_SUBST(BNMRLIBS_LIBS)
+  AC_SUBST(BNMRLIBS_CFLAGS)
+fi
+
 if test "${BUILD_BMW_LIBS}" = "1"; then
   BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools"
   BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la"
@@ -1158,6 +1166,7 @@ AC_CONFIG_FILES([Makefile \
 		 src/external/libSpinValve/classes/Makefile \
                  src/external/libPhotoMeissner/Makefile \
                  src/external/libPhotoMeissner/classes/Makefile \
+                 src/external/libBNMR/Makefile \
                  src/musredit/musredit_startup.xml \
                  src/musrgui/musrgui_startup.xml])
 
diff --git a/src/external/Makefile.am b/src/external/Makefile.am
index 360579d1..755d9210 100644
--- a/src/external/Makefile.am
+++ b/src/external/Makefile.am
@@ -19,4 +19,8 @@ if BUILD_BMWLIBS
             libCalcMeanFieldsLEM
 endif
 
-SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS)
+if BUILD_BNMRLIBS
+  BNMRDIRS = libBNMR
+endif
+
+SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS) $(BNMRDIRS)
diff --git a/src/external/libBNMR/Makefile.am b/src/external/libBNMR/Makefile.am
index 4adedf8b..7b8022ec 100644
--- a/src/external/libBNMR/Makefile.am
+++ b/src/external/libBNMR/Makefile.am
@@ -18,7 +18,7 @@ dict_cpp_sources = \
 include_HEADERS = $(h_sources)
 noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
 
-AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(CUBA_CFLAGS) -I$(ROOTINCDIR)
+AM_CPPFLAGS = -I$(top_srcdir)/src/include -I../include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) -I$(ROOTINCDIR)
 AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
 
 BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
@@ -26,7 +26,7 @@ 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) $^
+	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libBNMR.la