diff --git a/undertaker/Makefile b/undertaker/Makefile
index adbd94b..f05d61b 100644
--- a/undertaker/Makefile
+++ b/undertaker/Makefile
@@ -13,7 +13,7 @@ CXXFLAGS = $(CFLAGS)
 
 LDFLAGS =
 # LDCOV = -coverage
-LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave-mt $(LDCOV)
+LDLIBS = libparser.a ../ziz/libziz.a -lstdc++ -lboost_system -lboost_regex -lboost_filesystem -lpicosat -lboost_wave $(LDCOV)
 
 PARSEROBJ = RsfReader.o KconfigWhitelist.o ConfigurationModel.o	\
 		    ModelContainer.o SatChecker.o BlockDefectAnalyzer.o  \
diff --git a/ziz/Makefile b/ziz/Makefile
index f48981f..ffc26a8 100644
--- a/ziz/Makefile
+++ b/ziz/Makefile
@@ -3,7 +3,7 @@ LDXX=g++
 DEBUG = -g3
 CFLAGS = -Wall -Wextra -O2 $(DEBUG)
 CXXFLAGS = $(CFLAGS)
-LDLIBS = -lboost_regex -lboost_wave-mt -lboost_system-mt $(LDCOV)
+LDLIBS = -lboost_regex -lboost_wave -lboost_system $(LDCOV)
 
 ZIZOBJ = Ziz.o
 HEADERS = $(wildcard *.h)