diff --git a/SoObjects/common.make b/SoObjects/common.make
index 13004a78a..f2c00d252 100644
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -23,7 +23,7 @@ ADDITIONAL_LIB_DIRS += \
 	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
         -L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
         -L/usr/local/lib \
-        -Wl,-rpath,../SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
+        -Wl,-rpath,$(SOGO_SYSLIBDIR)/sogo
 
 BUNDLE_LIBS += \
 	-lGDLAccess				\
diff --git a/Tests/Integration/GNUmakefile.preamble b/Tests/Integration/GNUmakefile.preamble
index 67eb61e04..22c9c3c58 100644
--- a/Tests/Integration/GNUmakefile.preamble
+++ b/Tests/Integration/GNUmakefile.preamble
@@ -14,6 +14,6 @@ ADDITIONAL_LIB_DIRS += \
 	-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 \
-	-Wl,-rpath,../../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
+	-Wl,-rpath,$(SOGO_SYSLIBDIR)/sogo
 
 ADDITIONAL_LDFLAGS += -Wl,--no-as-needed