diff --git a/makefile.inc b/makefile.inc
index 657ebf849..f2d93bf84 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -40,4 +40,4 @@ endif
 
 ifdef PROF
 	CFLAGS := $(CFLAGS) -DSS_PROF
-endif
\ No newline at end of file
+endif
diff --git a/server/core/Makefile b/server/core/Makefile
index 6f08a4729..000b30801 100644
--- a/server/core/Makefile
+++ b/server/core/Makefile
@@ -75,7 +75,7 @@ POBJS=maxpasswd.o secrets.o utils.o
 LIBS=-L../inih/extra -linih -lssl -lstdc++ \
 	-L$(EMBEDDED_LIB) \
 	-lz -lm -lcrypt -lcrypto -ldl -laio -lrt -pthread -llog_manager \
-	-lmysqld
+	-l:libmysqld.a
 
 all:	maxscale maxkeys maxpasswd
 
diff --git a/server/modules/monitor/Makefile b/server/modules/monitor/Makefile
index 7fdbc5843..035897d3e 100644
--- a/server/modules/monitor/Makefile
+++ b/server/modules/monitor/Makefile
@@ -39,7 +39,7 @@ GALERAOBJ=$(GALERASRCS:.c=.o)
 SRCS=$(MYSQLSRCS)
 OBJ=$(SRCS:.c=.o)
 LIBS=$(UTILSPATH)/skygw_utils.o -llog_manager \
-	-L$(EMBEDDED_LIB) -lmysqld
+	-L$(EMBEDDED_LIB) -l:libmysqld.a
 MODULES=libmysqlmon.so libgaleramon.so
 
 
diff --git a/server/modules/routing/readwritesplit/Makefile b/server/modules/routing/readwritesplit/Makefile
index c60f2ffd1..07f956ed6 100644
--- a/server/modules/routing/readwritesplit/Makefile
+++ b/server/modules/routing/readwritesplit/Makefile
@@ -38,7 +38,7 @@ LDFLAGS=-shared -L$(LOGPATH) -L$(QCLASSPATH) -L$(EMBEDDED_LIB) \
 
 SRCS=readwritesplit.c
 OBJ=$(SRCS:.c=.o)
-LIBS=-lssl -pthread -llog_manager -lquery_classifier -lmysqld
+LIBS=-lssl -pthread -llog_manager -lquery_classifier -l:libmysqld.a
 MODULES=libreadwritesplit.so
 
 all:	$(MODULES)