diff -uNr a/ActiveSync/common.make b/ActiveSync/common.make
--- a/ActiveSync/common.make	2014-11-21 15:27:17.000000000 +0100
+++ b/ActiveSync/common.make	2014-11-24 11:58:42.005532616 +0100
@@ -20,7 +20,7 @@
 	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
         -L/usr/local/lib \
-	-Wl,-rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
+	-Wl,-rpath,$(SOGO_SYSLIBDIR)/sogo
 
 BUNDLE_LIBS += \
 	-lSOGo					\
diff -uNr a/configure b/configure
--- a/configure	2014-11-21 15:27:20.000000000 +0100
+++ b/configure	2014-11-24 11:53:37.441128345 +0100
@@ -270,7 +270,7 @@
   fi
 
   cfgwrite "HOSTNAME=${HOSTNAME}"
-  cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_LIBRARIES}"
+  cfgwrite "SOGO_SYSLIBDIR=\${GNUSTEP_SYSTEM_LIBRARIES}"
   cfgwrite "SOGO_LIBDIR=\${GNUSTEP_LIBRARY}/SOGo"
   cfgwrite "SOGO_TEMPLATESDIR=\${SOGO_LIBDIR}/Templates"
   cfgwrite "SOGO_WEBSERVERRESOURCESDIR=\${SOGO_LIBDIR}/WebServerResources"
diff -uNr a/Main/GNUmakefile b/Main/GNUmakefile
--- a/Main/GNUmakefile	2014-11-21 15:27:18.000000000 +0100
+++ b/Main/GNUmakefile	2014-11-24 11:59:05.588563673 +0100
@@ -6,7 +6,7 @@
 
 ADDITIONAL_OBJCFLAGS += -fPIE
 ADDITIONAL_INCLUDE_DIRS +=
-ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 SOGOD     = sogod
 TOOL_NAME = $(SOGOD)
diff -uNr a/Tests/Integration/GNUmakefile.preamble b/Tests/Integration/GNUmakefile.preamble
--- a/Tests/Integration/GNUmakefile.preamble	2014-11-21 15:27:19.000000000 +0100
+++ b/Tests/Integration/GNUmakefile.preamble	2014-11-24 11:59:26.644591373 +0100
@@ -16,4 +16,4 @@
 	-L/usr/local/lib/sogo -L/usr/lib/sogo -L/usr/lib64/sogo -lEOControl -lNGStreams -lNGMime -lNGExtensions
 
 
-ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
diff -uNr a/Tools/GNUmakefile b/Tools/GNUmakefile
--- a/Tools/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/Tools/GNUmakefile	2014-11-24 11:58:01.317478951 +0100
@@ -4,7 +4,7 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 ###
 SOGO_TOOL = sogo-tool