diff --git a/OGoContentStore/GNUmakefile.preamble b/OGoContentStore/GNUmakefile.preamble
index b2d9374e7..3a458580d 100644
--- a/OGoContentStore/GNUmakefile.preamble
+++ b/OGoContentStore/GNUmakefile.preamble
@@ -7,8 +7,7 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
 	-lNGExtensions	\
 	-lEOControl	\
 	-lSaxObjC	\
-	-lgnustep-base	\
-	-lobjc
+	$(BASE_LIBS)
 
 ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE -I../SoObjects
 
@@ -29,4 +28,5 @@ test_quick_extract_TOOL_LIBS += \
 	-lNGCards		\
 	-lGDLContentStore	\
 	-lGDLAccess		\
-	-lOGoContentStore
+	-lOGoContentStore       \
+	$(BASE_LIBS)
diff --git a/SOPE/GDLContentStore/GNUmakefile.preamble b/SOPE/GDLContentStore/GNUmakefile.preamble
index 6c900d3a3..114432e71 100644
--- a/SOPE/GDLContentStore/GNUmakefile.preamble
+++ b/SOPE/GDLContentStore/GNUmakefile.preamble
@@ -8,11 +8,12 @@ ADDITIONAL_INCLUDE_DIRS += -I. -I..
 
 
 # dependencies
+BASE_LIBS := $(shell gnustep-config --base-libs)
 
 libGDLContentStore_LIBRARIES_DEPEND_UPON += \
 	-lGDLAccess			\
 	-lNGExtensions -lEOControl	\
-        -lgnustep-base -lobjc
+        $(BASE_LIBS)
 
 GDLContentStore_LIBRARIES_DEPEND_UPON += \
 	-framework GDLAccess	\
@@ -25,7 +26,7 @@ GCS_TOOL_LIBS += \
 	-lGDLContentStore -lGDLAccess	\
 	-lNGExtensions -lEOControl	\
 	-lDOM -lSaxObjC \
-        -lgnustep-base
+        $(BASE_LIBS)
 else
 GCS_TOOL_LIBS += \
 	-framework GDLContentStore -framework GDLAccess	\
diff --git a/SOPE/NGCards/GNUmakefile.preamble b/SOPE/NGCards/GNUmakefile.preamble
index 6fc0b523b..1652f8ac5 100644
--- a/SOPE/NGCards/GNUmakefile.preamble
+++ b/SOPE/NGCards/GNUmakefile.preamble
@@ -17,11 +17,13 @@ ADDITIONAL_INCLUDE_DIRS += \
 
 # dependencies
 
+BASE_LIBS := $(shell gnustep-config --base-libs)
+
 libNGCards_LIBRARIES_DEPEND_UPON += \
 	-lNGExtensions	\
 	-lEOControl	\
 	-lSaxObjC \
-        -lgnustep-base -lobjc -lm
+        $(BASE_LIBS)
 
 NGCards_LIBRARIES_DEPEND_UPON += \
 	-framework NGExtensions	-framework EOControl \
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index fba77f3e2..f9b0a1515 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -24,7 +24,8 @@ SOGo_LIBRARIES_DEPEND_UPON += \
 	-lNGStreams -lNGExtensions -lEOControl \
 	-lDOM -lSaxObjC \
 	-lNGLdap -lSBJson \
-        -lGDLContentStore -lgnustep-base -lobjc -ldl
+        -lGDLContentStore \
+        $(BASE_LIBS)
 
 ifeq ($(HAS_LIBRARY_gnutls),yes)
 ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
diff --git a/UI/SOGoUI/GNUmakefile.preamble b/UI/SOGoUI/GNUmakefile.preamble
index 9288140ff..babfaf5bc 100644
--- a/UI/SOGoUI/GNUmakefile.preamble
+++ b/UI/SOGoUI/GNUmakefile.preamble
@@ -10,7 +10,8 @@ libSOGoUI_LIBRARIES_DEPEND_UPON += \
 	-lNGObjWeb	\
 	-lNGMime	\
 	-lNGExtensions -lEOControl \
-	-lSaxObjC -lgnustep-base -lSOGo -lobjc
+	-lSaxObjC -lSOGo \
+        $(BASE_LIBS)
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 ADDITIONAL_INCLUDE_DIRS += -I../../SoObjects
diff --git a/UI/common.make b/UI/common.make
index 60288a7ac..87c3d4fb8 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -42,5 +42,5 @@ endif
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 BUNDLE_LIBS += \
-	-lSOGoUI				\
+	-lSOGoUI	\
 	-lSOGo
diff --git a/configure b/configure
index f5cfdab12..4ca694817 100755
--- a/configure
+++ b/configure
@@ -375,6 +375,7 @@ EOF
 }
 
 checkDependencies() {
+  cfgwrite "BASE_LIBS := `gnustep-config --base-libs`"
   if test "x$ARG_ENABLE_SAML2" = "x1"; then
       checkLinking "lasso"   required;
       if test $? = 0; then