diff --git a/lib/cpp/Makefile.am b/lib/cpp/Makefile.am
index f48aed2..a61d70f 100644
--- a/lib/cpp/Makefile.am
+++ b/lib/cpp/Makefile.am
@@ -27,7 +27,7 @@
 
 lib_LTLIBRARIES = libthrift.la
 pkgconfig_DATA = thrift.pc
-libthrift_la_LDFLAGS = -release $(VERSION)
+libthrift_la_LDFLAGS = -release $(VERSION) $(BOOST_LDFLAGS)
 
 ## We only build the extra libraries if we have the dependencies,
 ## but we install all of the headers unconditionally.
@@ -100,12 +100,8 @@
 libthriftz_la_CPPFLAGS  = $(AM_CPPFLAGS) $(ZLIB_CPPFLAGS)
 libthriftnb_la_CXXFLAGS = $(AM_CXXFLAGS)
 libthriftz_la_CXXFLAGS  = $(AM_CXXFLAGS)
-libthriftnb_la_LDFLAGS  = -release $(VERSION)
-libthriftz_la_LDFLAGS   = -release $(VERSION)
-
-if WITH_BOOSTTHREADS
-libthrift_la_LIBADD = -lboost_thread
-endif
+libthriftnb_la_LDFLAGS  = -release $(VERSION) $(BOOST_LDFLAGS)
+libthriftz_la_LDFLAGS   = -release $(VERSION) $(BOOST_LDFLAGS)
 
 include_thriftdir = $(includedir)/thrift
 include_thrift_HEADERS = \