diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index 0a7155d9b..f49ab0b73 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -2,18 +2,7 @@
 
 libSOGo_INCLUDE_DIRS += -I.. -I../../..
 
-ifneq ($(GNUSTEP_BUILD_DIR),)
-	RELBUILD_DIR_libOGoContentStore = \
-		$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
-else
-	RELBUILD_DIR_libOGoContentStore = \
-		../../OGoContentStore/$(GNUSTEP_OBJ_DIR)
-endif
-
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
-
-libSOGo_LIB_DIRS +=				\
-	-L$(RELBUILD_DIR_libOGoContentStore) -L$(RELBUILD_DIR_libOGoContentStore)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)
+SYSTEM_LIB_DIR += -L/usr/local/lib
 
 libSOGo_LIBRARIES_DEPEND_UPON += \
 	-lOGoContentStore	\
@@ -27,9 +16,9 @@ libSOGo_LIBRARIES_DEPEND_UPON += \
 
 ADDITIONAL_TOOL_LIBS += \
         -L$(GNUSTEP_OBJ_DIR)/ \
-        $(libSOGO_LIB_DIRS) \
+        -lSOGo \
 	-lGDLContentStore -lGDLAccess	\
+        -lNGCards                       \
 	-lNGLdap			\
 	-lNGExtensions -lEOControl	\
 	-lDOM -lSaxObjC
-