diff --git a/core/Makefile b/core/Makefile
index a2bafa9b2..7ed5d1728 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -49,8 +49,10 @@ CFLAGS=-c -I/usr/include -I../include -I../inih \
 include ../../makefile.inc
 
 LDFLAGS=-rdynamic -L$(LOGPATH) \
-	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
-	-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
+	-Wl,-rpath,$(DEST)/lib
+
+#	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
+#	-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
 
 SRCS= atomic.c buffer.c spinlock.c gateway.c gateway_mysql_protocol.c \
 	gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c \
@@ -102,5 +104,6 @@ depend:
 install: maxscale maxkeys maxpasswd
 	@mkdir -p $(DEST)/bin
 	install -D maxscale maxkeys maxpasswd  $(DEST)/bin
+	install -D $(MARIADB_SRC_PATH)/libmysqld/libmysqld.so.18 $(DEST)/lib
 
 include depend.mk
diff --git a/modules/monitor/Makefile b/modules/monitor/Makefile
index c4299cdac..a93439163 100644
--- a/modules/monitor/Makefile
+++ b/modules/monitor/Makefile
@@ -25,8 +25,13 @@ UTILSPATH := $(ROOT_PATH)/utils
 CC=cc
 CFLAGS=-c -fPIC -I. -I/usr/include -I../include -I../../include -I$(LOGPATH) \
 	-I$(UTILSPATH) -I$(MARIADB_SRC_PATH)/include/ -Wall -g
-LDFLAGS=-shared  -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
+
+LDFLAGS=-shared  -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
+	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) \
 	-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
+
+
+
 MYSQLSRCS=mysql_mon.c
 MYSQLOBJ=$(MYSQLSRCS:.c=.o)
 GALERASRCS=mysql_mon.c
diff --git a/modules/protocol/Makefile b/modules/protocol/Makefile
index 3eba66efb..1d98f76db 100644
--- a/modules/protocol/Makefile
+++ b/modules/protocol/Makefile
@@ -34,7 +34,9 @@ CFLAGS=-c -fPIC -I/usr/include -I../include -I../../include -I$(LOGPATH) \
 
 include ../../../makefile.inc
 
-LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
+LDFLAGS=-shared -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
+	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
+
 MYSQLCLIENTSRCS=mysql_client.c mysql_common.c
 MYSQLCLIENTOBJ=$(MYSQLCLIENTSRCS:.c=.o)
 MYSQLBACKENDSRCS=mysql_backend.c mysql_common.c
diff --git a/modules/routing/Makefile b/modules/routing/Makefile
index 9d7a64810..d42fe3892 100644
--- a/modules/routing/Makefile
+++ b/modules/routing/Makefile
@@ -33,7 +33,9 @@ CFLAGS=-c -fPIC -I/usr/include -I../include -I../../include -I$(LOGPATH) \
 
 include ../../../makefile.inc
 
-LDFLAGS=-shared  -L$(LOGPATH) -Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
+LDFLAGS=-shared  -L$(LOGPATH) -Wl,-rpath,$(DEST)/lib \
+	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH)
+
 TESTSRCS=testroute.c
 TESTOBJ=$(TESTSRCS:.c=.o)
 READCONSRCS=readconnroute.c
diff --git a/modules/routing/readwritesplit/Makefile b/modules/routing/readwritesplit/Makefile
index 85b70f597..fc0b7076f 100644
--- a/modules/routing/readwritesplit/Makefile
+++ b/modules/routing/readwritesplit/Makefile
@@ -32,8 +32,10 @@ CFLAGS=-c -fPIC -I/usr/include -I../../include -I../../../include \
 include ../../../../makefile.inc
 
 LDFLAGS=-shared -L$(LOGPATH) -L$(QCLASSPATH) -L$(MARIADB_SRC_PATH)/libmysqld \
+	-Wl,-rpath,$(DEST)/lib \
 	-Wl,-rpath,$(LOGPATH) -Wl,-rpath,$(UTILSPATH) -Wl,-rpath,$(QCLASSPATH) \
 	-Wl,-rpath,$(MARIADB_SRC_PATH)/libmysqld
+
 SRCS=readwritesplit.c
 OBJ=$(SRCS:.c=.o)
 LIBS=-lssl -pthread -llog_manager -lquery_classifier -lmysqld