diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8440ca65..32ed645c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,9 +1,16 @@
 AM_CPPFLAGS =					\
--I$(top_srcdir)
+-I$(top_srcdir)                                 \
+$(BOOST_CPPFLAGS)
+
+LDFLAGS = $(BOOST_LDFLAGS)
 
 LDADD =						\
 $(top_builddir)/libopmcore.la			\
-$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
+$(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)    \
+$(BOOST_FILESYSTEM_LIB)                         \
+$(BOOST_SYSTEM_LIB)                             \
+$(BOOST_DATE_TIME_LIB)                          \
+$(BOOST_UNIT_TEST_FRAMEWORK_LIB)
 
 noinst_PROGRAMS =				\
 scaneclipsedeck
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 54a27d48..7e4f01fd 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,7 +2,7 @@ AM_CPPFLAGS =					\
 -I$(top_srcdir)                                 \
 $(BOOST_CPPFLAGS)
 
-LDFLAGS = $(BOOST_LDADD)
+LDFLAGS = $(BOOST_LDFLAGS)
 
 
 LDADD =						\