diff --git a/core/Makefile b/core/Makefile
index 89418dccb..455427964 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -32,6 +32,8 @@
 #                                       are behind SS_DEBUG macros.
 # 29/06/13       Vilho Raatikka         Reverted Query classifier changes because
 #                                       gateway needs mysql client lib, not qc.
+# 03/07/13	 Vilho Raatikka		Added target 'links' which creates links
+#                                       to libraries needed by gateway.
 
 include ../../build_gateway.inc
 
@@ -76,6 +78,7 @@ gateway: $(OBJ)
 
 clean:
 	rm -f $(OBJ) gateway
+	rm *.so
 
 tags:
 	ctags $(SRCS) $(HDRS)
@@ -87,4 +90,14 @@ depend:
 install: gateway
 	install -D $< $(DEST)
 
+links:
+	ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/libdebugcli.so \
+	./libdebugcli.so
+	ln -s $(ROOT_PATH)/epoll_v1.0/modules/routing/libreadconnroute.so \
+	libreadconnroute.so
+	ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libMySQLClient.so \
+	libMySQLClient.so
+	ln -s $(ROOT_PATH)/epoll_v1.0/modules/protocol/libtelnetd.so \
+	libtelnetd.so
+
 include depend.mk