diff --git a/Makefile b/Makefile
index 5eeea7f03..cc6085791 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 # 08/07/13	Mark Riddoch		Addition of monitor modules
 # 16/07/13	Mark Riddoch		Renamed things to match the new naming
 
-DEST=/home/mriddoch/usr/local/skysql
+DEST=$(HOME)/usr/local/skysql
 
 all:
 	(cd inih/extra ; make -f Makefile.static)
diff --git a/core/Makefile b/core/Makefile
index b88961a06..b80bdf641 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -69,7 +69,7 @@ OBJ=$(SRCS:.c=.o)
 
 LIBS=-L../inih/extra -linih -lssl -lstdc++ \
 	-L$(MARIADB_SRC_PATH)/libmysqld \
-	-lz -lm -lcrypto -ldl -pthread -llog_manager \
+	-lz -lm -lcrypt -lcrypto -ldl -pthread -llog_manager \
 	-lmysqld
 
 maxscale: $(OBJ)