diff -uNr a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
--- a/OpenChange/GNUmakefile	2014-11-21 15:27:18.000000000 +0100
+++ b/OpenChange/GNUmakefile	2014-11-24 11:11:43.572921752 +0100
@@ -179,7 +179,7 @@
 	-DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \
 	-DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\""
 
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/SoObjects/common.make b/SoObjects/common.make
--- a/SoObjects/common.make	2014-11-21 15:27:19.000000000 +0100
+++ b/SoObjects/common.make	2014-11-24 11:11:56.931937812 +0100
@@ -23,7 +23,7 @@
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
         -L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
         -L/usr/local/lib \
-        -Wl,-rpath,$(SOGO_SYSLIBDIR)/sogo
+        -Wl,-rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 BUNDLE_LIBS += \
 	-lGDLAccess				\
diff -uNr a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
--- a/SoObjects/SOGo/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/SoObjects/SOGo/GNUmakefile	2014-11-24 11:12:12.043955962 +0100
@@ -11,7 +11,7 @@
 #SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
 SOGo_INSTALL_DIR = $(DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
 
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 SOGo_HEADER_FILES = \
 	SOGoBuild.h \
diff -uNr a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile
--- a/UI/AdministrationUI/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/AdministrationUI/GNUmakefile	2014-11-24 11:24:42.215834978 +0100
@@ -25,7 +25,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
--- a/UI/Common/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/Common/GNUmakefile	2014-11-24 11:13:33.052052940 +0100
@@ -33,7 +33,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
--- a/UI/Contacts/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/Contacts/GNUmakefile	2014-11-24 11:24:28.095818807 +0100
@@ -38,7 +38,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
--- a/UI/MailerUI/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/MailerUI/GNUmakefile	2014-11-24 11:12:26.531973345 +0100
@@ -46,7 +46,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../MailPartViewers/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
--- a/UI/MailPartViewers/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/MailPartViewers/GNUmakefile	2014-11-24 11:13:20.852038369 +0100
@@ -37,7 +37,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += $(shell xml2-config --cflags)
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../../SoObjects/Mailer/obj -L../../SoObjects/Appointments/obj
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
--- a/UI/MainUI/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/MainUI/GNUmakefile	2014-11-24 11:13:07.420022312 +0100
@@ -32,7 +32,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
--- a/UI/PreferencesUI/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/PreferencesUI/GNUmakefile	2014-11-24 11:24:55.503850184 +0100
@@ -28,7 +28,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
--- a/UI/Scheduler/GNUmakefile	2014-11-21 15:27:20.000000000 +0100
+++ b/UI/Scheduler/GNUmakefile	2014-11-24 11:12:41.851991707 +0100
@@ -72,7 +72,7 @@
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff -uNr a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
--- a/UI/SOGoUI/GNUmakefile	2014-11-21 15:27:19.000000000 +0100
+++ b/UI/SOGoUI/GNUmakefile	2014-11-24 11:12:54.532006892 +0100
@@ -11,7 +11,7 @@
 libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
 libSOGoUI_INTERFACE_VERSION	   = $(MAJOR_VERSION).$(MINOR_VERSION)
 
-ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 libSOGoUI_HEADER_FILES +=	\
 	\