diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index a7afca3a4..b4725fc4f 100644
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -98,7 +98,6 @@ Mailer_LOCALIZED_RESOURCE_FILES = Localizable.strings
 
 ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
 ADDITIONAL_INCLUDE_DIRS += $(shell xml2-config --cflags)
-ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
diff --git a/SoObjects/common.make b/SoObjects/common.make
index 0fa89a243..13004a78a 100644
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -18,18 +18,17 @@ ADDITIONAL_INCLUDE_DIRS += \
         -I../../SOPE
 
 ADDITIONAL_LIB_DIRS += \
-        -L../SOGo/SOGo.framework/Versions/Current/sogo/ \
+        -L../SOGo/SOGo.framework/Versions/Current/sogo/ -lSOGo \
 	-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
-	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
+	-L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ -lNGCards \
+        -L../../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/ -lGDLContentStore \
         -L/usr/local/lib \
-        -Wl,-rpath,../SoObjects/SOGo/SOGo.framework/Versions/Current/sogo
+        -Wl,-rpath,../SOGo/SOGo.framework/Versions/Current/sogo -Wl,-rpath,../../SOPE/NGCards/obj -Wl,-rpath,../../SOPE/GDLContentStore/obj
 
 BUNDLE_LIBS += \
-	-lSOGo					\
-	-lGDLContentStore			\
 	-lGDLAccess				\
 	-lNGObjWeb				\
-	-lNGCards -lNGMime -lNGLdap		\
+	-lNGMime -lNGLdap			\
 	-lNGStreams -lNGExtensions -lEOControl	\
 	-lDOM -lSaxObjC -lSBJson