diff --git a/GNUmakefile b/GNUmakefile
index def68eaa8..75961d306 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -4,6 +4,7 @@
 include $(GNUSTEP_MAKEFILES)/common.make
 
 SUBPROJECTS = \
+	SOPE/NGCards \
 	OGoContentStore	\
 	SoObjects	\
 	Main		\
@@ -11,4 +12,3 @@ SUBPROJECTS = \
 	Protocols	\
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
-
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 99bdcff36..9938d4af2 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -11,7 +11,8 @@ ADDITIONAL_INCLUDE_DIRS += \
 
 ADDITIONAL_LIB_DIRS += \
 	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
-	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/
+	-L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
+	-L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
diff --git a/OGoContentStore/GNUmakefile.preamble b/OGoContentStore/GNUmakefile.preamble
index faf4e378b..e39140e3f 100644
--- a/OGoContentStore/GNUmakefile.preamble
+++ b/OGoContentStore/GNUmakefile.preamble
@@ -8,9 +8,9 @@ libOGoContentStore_LIBRARIES_DEPEND_UPON += \
 	-lEOControl	\
 	-lSaxObjC
 
-ADDITIONAL_INCLUDE_DIRS += -I. -I..
+ADDITIONAL_INCLUDE_DIRS += -I. -I.. -I../SOPE
 
-ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR)
+ADDITIONAL_LIB_DIRS += -L./$(GNUSTEP_OBJ_DIR) -L../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)/
 
 SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
diff --git a/Protocols/common.make b/Protocols/common.make
index 0cc98888b..8d43914d6 100644
--- a/Protocols/common.make
+++ b/Protocols/common.make
@@ -12,14 +12,18 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I..		\
 	-I../..		\
 	-I../../..	\
-	-I../../SoObjects
+	-I../../SoObjects \
+	-I../../SOPE
 
+RELBUILD_DIR_libNGCards = \
+	$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGo = \
 	$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libOGoContentStore = \
 	$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
 
 ADDITIONAL_LIB_DIRS += 				\
+	-L$(RELBUILD_DIR_libNGCards)		\
 	-L$(RELBUILD_DIR_libSOGo)		\
 	-L$(RELBUILD_DIR_libOGoContentStore)
 
diff --git a/SoObjects/GNUmakefile b/SoObjects/GNUmakefile
index e685b16b1..4fad16f24 100644
--- a/SoObjects/GNUmakefile
+++ b/SoObjects/GNUmakefile
@@ -8,6 +8,6 @@ SUBPROJECTS = \
 	Appointments	\
 	Contacts	\
 	Mailer		\
-	Sieve		\
+#	Sieve		\
 
 include $(GNUSTEP_MAKEFILES)/aggregate.make
diff --git a/SoObjects/common.make b/SoObjects/common.make
index 8b1fb43d9..3684a1e46 100644
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -10,14 +10,15 @@ BUNDLE_INSTALL_DIR   = $(GNUSTEP_USER_ROOT)/Library/SOGo-$(MAJOR_VERSION).$(MINO
 WOBUNDLE_EXTENSION   = $(BUNDLE_EXTENSION)
 WOBUNDLE_INSTALL_DIR = $(BUNDLE_INSTALL_DIR)
 
-SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
+# SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I.. \
 	-I../..
 
 ADDITIONAL_LIB_DIRS += \
-	-L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
+        -L../SOGo/$(GNUSTEP_OBJ_DIR)/ \
+	-L../../SOGo/$(GNUSTEP_OBJ_DIR)/ \
 	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/
 
 BUNDLE_LIBS += \
diff --git a/UI/common.make b/UI/common.make
index f1c5fdb8f..0481cca4c 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -12,15 +12,19 @@ ADDITIONAL_INCLUDE_DIRS += \
 	-I..		\
 	-I../..		\
 	-I../../..	\
-	-I../../SoObjects
+	-I../../SoObjects \
+	-I../../SOPE
 
 ifeq ($(GNUSTEP_BUILD_DIR),)
 
 ADDITIONAL_LIB_DIRS += 				\
+        -L../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR)	\
 	-L../SOGoUI/$(GNUSTEP_OBJ_DIR)		\
 	-L../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)
 
 else
+RELBUILD_DIR_libNGCards = \
+	$(GNUSTEP_BUILD_DIR)/../../SOPE/NGCards/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGo = \
 	$(GNUSTEP_BUILD_DIR)/../../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR_NAME)
 RELBUILD_DIR_libSOGoUI = \
@@ -29,6 +33,7 @@ RELBUILD_DIR_libOGoContentStore = \
 	$(GNUSTEP_BUILD_DIR)/../../OGoContentStore/$(GNUSTEP_OBJ_DIR_NAME)
 
 ADDITIONAL_LIB_DIRS += 				\
+	-L$(RELBUILD_DIR_libNGCards)		\
 	-L$(RELBUILD_DIR_libSOGo)		\
 	-L$(RELBUILD_DIR_libSOGoUI)		\
 	-L$(RELBUILD_DIR_libOGoContentStore)