diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index 962730cbc..ac0632d8a 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -7,7 +7,7 @@ include ../Version
 ADDITIONAL_OBJCFLAGS += -fPIE
 ADDITIONAL_INCLUDE_DIRS +=
 ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 SOGOD     = sogod
 TOOL_NAME = $(SOGOD)
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 022e3d1e2..a75f9f932 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -9,7 +9,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I..
 
 ADDITIONAL_LIB_DIRS += \
-	-L../SoObjects/SOGo/SOGo.framework  \
+	-L../SoObjects/SOGo/SOGo.framework/sogo  \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index e3adc5f7e..29939b87d 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -137,7 +137,7 @@ $(DBMSGREADER_TOOL)_OBJC_FILES += \
 	NSObject+PropertyList.m
 
 $(DBMSGREADER_TOOL)_LIB_DIRS += \
-	-L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
+	-L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
 	-L../SOPE/GDLContentStore/obj/ -lGDLContentStore \
 	-L../SOPE/NGCards/obj/ -lNGCards \
 	-lNGObjWeb
@@ -161,12 +161,12 @@ LIBMAPISTORE_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy -lWEExte
 
 $(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends
 $(MAPISTORESOGO)_LIB_DIRS += \
-        -L../SoObjects/SOGo/SOGo.framework/ -lSOGo -lgnustep-base -lobjc -lNGObjWeb \
+        -L../SoObjects/SOGo/SOGo.framework/sogo/ -lSOGo -lgnustep-base -lobjc -lNGObjWeb \
 	$(LIBMAPI_LIBS) \
 	$(LIBMAPISTORE_LIBS)
 
 $(SOGOBACKEND)_LIB_DIRS += \
-        -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
+        -L../SoObjects/SOGo/SOGo.framework/sogo/ -lSOGo \
 	$(LIBMAPI_LIBS) \
 	$(LIBMAPISTORE_LIBS)
 
@@ -179,6 +179,8 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \
 	-DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\""
 
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/library.make
diff --git a/SOPE/GDLContentStore/GNUmakefile b/SOPE/GDLContentStore/GNUmakefile
index 84f24d0c0..b94b4057d 100644
--- a/SOPE/GDLContentStore/GNUmakefile
+++ b/SOPE/GDLContentStore/GNUmakefile
@@ -74,6 +74,7 @@ ifneq ($(frameworks),yes)
 ifneq ($(FHS_INSTALL_ROOT),)
 GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
 endif
+GNUSTEP_TARGET_LDIR=sogo
 include $(GNUSTEP_MAKEFILES)/library.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
diff --git a/SOPE/NGCards/GNUmakefile b/SOPE/NGCards/GNUmakefile
index 90f75848a..31cfdd836 100644
--- a/SOPE/NGCards/GNUmakefile
+++ b/SOPE/NGCards/GNUmakefile
@@ -131,6 +131,7 @@ ifneq ($(frameworks),yes)
 ifneq ($(FHS_INSTALL_ROOT),)
 GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
 endif
+GNUSTEP_TARGET_LDIR=sogo
 include $(GNUSTEP_MAKEFILES)/library.make
 else
 include $(GNUSTEP_MAKEFILES)/framework.make
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index f1ee391bd..70b458001 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -11,6 +11,8 @@ SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 #SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
 SOGo_INSTALL_DIR = $(DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
 
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+
 SOGo_HEADER_FILES = \
 	SOGoBuild.h \
 	SOGoProductLoader.h		\
@@ -200,6 +202,7 @@ ADDITIONAL_LDFLAGS += -lmemcached
 ifneq ($(FHS_INSTALL_ROOT),)
 GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
 endif
+GNUSTEP_TARGET_LDIR=sogo
 include $(GNUSTEP_MAKEFILES)/framework.make
 include $(GNUSTEP_MAKEFILES)/library.make
 include $(GNUSTEP_MAKEFILES)/tool.make
diff --git a/SoObjects/common.make b/SoObjects/common.make
index 31f10e1ac..ef14724ba 100644
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -18,7 +18,7 @@ ADDITIONAL_INCLUDE_DIRS += \
         -I../../SOPE
 
 ADDITIONAL_LIB_DIRS += \
-        -L../SOGo/SOGo.framework/ \
+        -L../SOGo/SOGo.framework/sogo/ \
 	-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
         -L/usr/local/lib
diff --git a/Tests/Integration/GNUmakefile.preamble b/Tests/Integration/GNUmakefile.preamble
index cd29c8e19..7237a3cd8 100644
--- a/Tests/Integration/GNUmakefile.preamble
+++ b/Tests/Integration/GNUmakefile.preamble
@@ -10,7 +10,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/
 
 ADDITIONAL_LIB_DIRS += \
-	-L../../SoObjects/SOGo/SOGo.framework -lSOGo \
+	-L../../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
 	-L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
         -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions
diff --git a/Tests/Unit/GNUmakefile b/Tests/Unit/GNUmakefile
index 6b99e05a5..bcfd13850 100644
--- a/Tests/Unit/GNUmakefile
+++ b/Tests/Unit/GNUmakefile
@@ -33,9 +33,9 @@ $(TEST_TOOL)_CPPFLAGS += \
 	-Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/
 
 ADDITIONAL_LIB_DIRS += \
-	-L../../SoObjects/SOGo/SOGo.framework/Versions/Current -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc \
+	-L../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -L../../SOPE/NGCards/obj -L../../SOPE/GDLContentStore/obj -lSOGo -lNGMime -lNGCards -lGDLContentStore -lNGExtensions -lSBJson -lobjc \
 	-L/usr/local/lib  -lSaxObjC \
-	-Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
+	-Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
 ADDITIONAL_LDFLAGS += -Wl,--no-as-needed
 
 -include GNUmakefile.preamble
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index c5b56a1fc..ec65344f3 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -4,6 +4,8 @@ include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+
 ###
 SOGO_TOOL = sogo-tool
 $(SOGO_TOOL)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
diff --git a/Tools/GNUmakefile.preamble b/Tools/GNUmakefile.preamble
index fc78b8b0a..1cf88ce79 100644
--- a/Tools/GNUmakefile.preamble
+++ b/Tools/GNUmakefile.preamble
@@ -10,7 +10,7 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-D_GNU_SOURCE -I../SOPE/ -I../SoObjects/
 
 ADDITIONAL_LIB_DIRS += \
-	-L../SoObjects/SOGo/SOGo.framework -lSOGo \
+	-L../SoObjects/SOGo/SOGo.framework/sogo -lSOGo \
 	-L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
         -L/usr/local/lib -L/usr/lib -lEOControl -lNGStreams -lNGMime -lNGExtensions -lNGObjWeb
diff --git a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile
index d57aee9dc..041edd709 100644
--- a/UI/AdministrationUI/GNUmakefile
+++ b/UI/AdministrationUI/GNUmakefile
@@ -25,6 +25,7 @@ AdministrationUI_LOCALIZED_RESOURCE_FILES += \
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index 5eaf6c036..eb5671695 100644
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -33,6 +33,7 @@ CommonUI_LOCALIZED_RESOURCE_FILES +=	\
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index 6e32c50db..ef8a09ebf 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -38,6 +38,7 @@ ContactsUI_LOCALIZED_RESOURCE_FILES +=	\
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
index a094e92eb..57a874fb4 100644
--- a/UI/MailPartViewers/GNUmakefile
+++ b/UI/MailPartViewers/GNUmakefile
@@ -37,6 +37,7 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \
 
 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
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 851eb9abf..b3754bbaf 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -46,6 +46,7 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/ -L../MailPartViewers/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index 62837f307..acd40f8ef 100644
--- a/UI/MainUI/GNUmakefile
+++ b/UI/MainUI/GNUmakefile
@@ -32,6 +32,7 @@ MainUI_LOCALIZED_RESOURCE_FILES += \
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
index 7aa0511d2..c2c75ab39 100644
--- a/UI/PreferencesUI/GNUmakefile
+++ b/UI/PreferencesUI/GNUmakefile
@@ -28,6 +28,7 @@ PreferencesUI_LOCALIZED_RESOURCE_FILES += \
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
index 2b781caed..7ec6f08dc 100644
--- a/UI/SOGoUI/GNUmakefile
+++ b/UI/SOGoUI/GNUmakefile
@@ -11,6 +11,8 @@ libSOGoUI_HEADER_FILES_DIR         = .
 libSOGoUI_HEADER_FILES_INSTALL_DIR = /SOGoUI
 libSOGoUI_INTERFACE_VERSION	   = $(MAJOR_VERSION).$(MINOR_VERSION)
 
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+
 libSOGoUI_HEADER_FILES +=	\
 	\
 	UIxJSClose.h		\
@@ -32,5 +34,6 @@ libSOGoUI_OBJC_FILES +=		\
 ifneq ($(FHS_INSTALL_ROOT),)
 GNUSTEP_HEADERS=$(DESTDIR)$(FHS_INSTALL_ROOT)/include
 endif
+GNUSTEP_TARGET_LDIR=sogo
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 9f96857a6..cc574b512 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -72,6 +72,7 @@ SchedulerUI_RESOURCE_FILES +=		\
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
+ADDITIONAL_LDFLAGS += -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/common.make b/UI/common.make
index 80d67ea23..b44a3e0b2 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -20,13 +20,13 @@ ifeq ($(GNUSTEP_BUILD_DIR),)
 ADDITIONAL_LIB_DIRS += 				\
         -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)	\
 	-L../SOGoUI/$(GNUSTEP_OBJ_DIR)		\
-	-L../../SoObjects/SOGo/SOGo.framework/
+	-L../../SoObjects/SOGo/SOGo.framework/sogo/
 
 else
 RELBUILD_DIR_libNGCards = \
 	$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGo = \
-	$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/SOGo.framework/
+	$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/SOGo.framework/sogo/
 RELBUILD_DIR_libSOGoUI = \
 	$(GNUSTEP_BUILD_DIR)/../SOGoUI/$(GNUSTEP_OBJ_DIR_NAME)