diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index ac0632d8a..33a40230d 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -6,8 +6,7 @@ include ../Version
 
 ADDITIONAL_OBJCFLAGS += -fPIE
 ADDITIONAL_INCLUDE_DIRS +=
-ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
-ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(SOGO_SYSLIBDIR)/sogo
+ADDITIONAL_LDFLAGS += -Wl,--no-as-needed -fPIE -pie -Wl,--rpath,$(GNUSTEP_SYSTEM_LIBRARIES)/sogo
 
 SOGOD     = sogod
 TOOL_NAME = $(SOGOD)
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 3e9dc6aa8..bc6998db8 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -9,11 +9,9 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I..
 
 ADDITIONAL_LIB_DIRS += \
-	-L../SoObjects/SOGo/SOGo.framework/sogo  \
+	-L../SoObjects/SOGo/SOGo.framework/sogo \
 	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/ \
-	-L/usr/local/lib/sogo -L/usr/lib/sogo -L/usr/lib64/sogo
-
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+	-L../SOPE/GDLContentStore/$(GNUSTEP_OBJ_DIR)/
 
 $(SOGOD)_TOOL_LIBS += \
 	-lSOGo			\