diff --git a/MatrixElement/FxFx/Makefile.am b/MatrixElement/FxFx/Makefile.am
--- a/MatrixElement/FxFx/Makefile.am
+++ b/MatrixElement/FxFx/Makefile.am
@@ -1,18 +1,22 @@
 pkglib_LTLIBRARIES = HwFxFx.la HwFxFxHandler.la
 HwFxFx_la_SOURCES = \
 FxFxFileReader.cc FxFxFileReader.fh FxFxFileReader.h\
 FxFxEventHandler.cc FxFxEventHandler.h\
 FxFxReader.cc FxFxReader.fh FxFxReader.h\
 FxFx.h
+HwFxFx_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) -I$(FASTJETPATH)
+HwFxFx_la_LIBADD = $(FASTJETLIBS) 
 HwFxFx_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
 
 HwFxFxHandler_la_SOURCES = \
 FxFxHandler.cc FxFxHandler.h
+HwFxFxHandler_la_CPPFLAGS = $(AM_CPPFLAGS) $(FASTJETINCLUDE) -I$(FASTJETPATH)
+HwFxFxHandler_la_LIBADD = $(FASTJETLIBS) 
 HwFxFxHandler_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
 
 #if HAVE_RIVET 
 #  pkglib_LTLIBRARIES += HwFxFxAnalysis.la
 #  HwFxFxAnalysis_la_SOURCES = \
 #  FxFxAnalysis.cc FxFxAnalysis.h
 #  HwFxFxAnalysis_la_LDFLAGS = $(AM_LDFLAGS) -module -version-info 1:0:0
 #endif
diff --git a/MatrixElement/Makefile.am b/MatrixElement/Makefile.am
--- a/MatrixElement/Makefile.am
+++ b/MatrixElement/Makefile.am
@@ -1,12 +1,16 @@
 SUBDIRS = General Lepton Hadron DIS Powheg Gamma Matchbox Reweighters
 
+if WANT_LIBFASTJET
+SUBDIRS += FxFx
+endif
+
 noinst_LTLIBRARIES = libHwME.la 
 
 libHwME_la_SOURCES =  \
 HwMEBase.h HwMEBase.fh HwMEBase.cc \
 MEfftoVH.h MEfftoVH.cc \
 MEfftoffH.h MEfftoffH.cc \
 HardVertex.fh HardVertex.h HardVertex.cc \
 ProductionMatrixElement.h ProductionMatrixElement.cc \
 DrellYanBase.h DrellYanBase.cc \
 BlobME.h BlobME.cc