diff --git a/config/common.am b/config/common.am
index 885fd48c13..c9d86b322b 100644
--- a/config/common.am
+++ b/config/common.am
@@ -37,6 +37,7 @@ BOOST_FILESYSTEM = -lboost_filesystem
 BOOST_REGEX = -lboost_regex
 BOOST_SIGNALS = -lboost_signals
 BOOST_IOSTREAMS = -lboost_iostreams
+BOOST_LIBS = $(BOOST_FILESYSTEM) $(BOOST_REGEX) $(BOOST_SIGNALS) $(BOOST_IOSTREAMS)
 endif
 
 LIBS =
diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am
index 5329a5701e..c6df6470d2 100644
--- a/src/tex2lyx/Makefile.am
+++ b/src/tex2lyx/Makefile.am
@@ -63,8 +63,7 @@ tex2lyx_SOURCES = \
 
 tex2lyx_LDADD = \
 	$(top_builddir)/src/support/liblyxsupport.la \
-	$(top_builddir)/boost/liblyxboost.la \
-	$(LIBICONV) @LIBS@
+	$(LIBICONV) $(BOOST_LIBS) @LIBS@
 
 tex2lyx.1:
 	cp -p $(srcdir)/tex2lyx.man tex2lyx.1