diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index f8113691b..53a8adcfe 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -5,8 +5,8 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 include ./Version
 
-ADDITIONAL_INCLUDE_DIRS += -I../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../SOPE/
+ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
 
 SOGOD     = sogod-$(MAJOR_VERSION).$(MINOR_VERSION)
 TOOL_NAME = $(SOGOD)
diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile
index 6b51f6b46..a6c0006df 100644
--- a/SoObjects/Appointments/GNUmakefile
+++ b/SoObjects/Appointments/GNUmakefile
@@ -47,8 +47,8 @@ Appointments_COMPONENTS +=	\
 	SOGoAptMailGermanRemoval.wo	\
 	SOGoAptMailGermanDeletion.wo	\
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile
index a979a373a..a68f8212e 100644
--- a/SoObjects/Contacts/GNUmakefile
+++ b/SoObjects/Contacts/GNUmakefile
@@ -19,8 +19,8 @@ Contacts_RESOURCE_FILES +=		\
 	Version				\
 	product.plist			\
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index 6be6f8a4f..907df7878 100644
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -48,8 +48,8 @@ Mailer_RESOURCE_FILES += \
 	SOGoMailFrenchReply.wo \
 	SOGoMailGermanReply.wo
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/wobundle.make
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index 2530959f5..7d15b89f5 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -87,8 +87,8 @@ agenor_emails4uid_OBJC_FILES += agenor_emails4uid.m
 agenor_defaults_OBJC_FILES   += agenor_defaults.m
 
 ADDITIONAL_TOOL_LIBS += -Lobj -lSOGo$(LIBRARY_NAME_SUFFIX)
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include ../common.make
diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index e25a1ae1d..873df3e60 100644
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -39,8 +39,8 @@ CommonUI_LOCALIZED_RESOURCE_FILES +=	\
 
 # make
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index cb61ff5c5..fed68ded9 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -33,8 +33,8 @@ ContactsUI_LOCALIZED_RESOURCE_FILES +=	\
 
 # make
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
index dcfb3665e..ffa92eb7e 100644
--- a/UI/MailPartViewers/GNUmakefile
+++ b/UI/MailPartViewers/GNUmakefile
@@ -40,8 +40,8 @@ MailPartViewers_LOCALIZED_RESOURCE_FILES += \
 
 # make
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index ba2c9579f..544e1b158 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -50,8 +50,8 @@ MailerUI_LOCALIZED_RESOURCE_FILES += \
 
 # make
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index 5bad0b55e..6b0378895 100644
--- a/UI/MainUI/GNUmakefile
+++ b/UI/MainUI/GNUmakefile
@@ -26,8 +26,8 @@ MainUI_RESOURCE_FILES += 	\
 MainUI_LOCALIZED_RESOURCE_FILES += \
 	Locale Localizable.strings
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
index e3e707975..2b34be9b5 100644
--- a/UI/PreferencesUI/GNUmakefile
+++ b/UI/PreferencesUI/GNUmakefile
@@ -24,8 +24,8 @@ PreferencesUI_RESOURCE_FILES += \
 PreferencesUI_LOCALIZED_RESOURCE_FILES += \
 	Localizable.strings		\
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index 7ef2b6158..aab7f0288 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -66,8 +66,8 @@ SchedulerUI_RESOURCE_FILES +=		\
 
 # make
 
-ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/sope-gdl1/
-ADDITIONAL_LIB_DIRS += -L../../SOPE/sope-gdl1/GDLContentStore/obj/
+ADDITIONAL_INCLUDE_DIRS += -I../../SOPE/
+ADDITIONAL_LIB_DIRS += -L../../SOPE/GDLContentStore/obj/
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/bundle.make