diff --git a/ChangeLog b/ChangeLog
index 55629bca9..5ad7217d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-11-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/GNUmakefile: the MAPIStoreSOGo library is now just a
+	wrapper that loads the new "SOGoBackend" bundle from
+	SoProductRegistry.
+
 	* SoObjects/SOGo/SOGoContentObject.m (-outlookMessageClass):
 	removed useless method.
 
diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index 9732ce94b..9bbdfe102 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -4,33 +4,31 @@ include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 
-LIBMAPI_CFLAGS = $(shell pkg-config libmapistore --cflags)
-
-ifeq ($(LIBMAPI_CFLAGS),)
-
-all install::
-	@echo "Cannot build the OpenChange SOGo backend (empty CFLAGS for libmapistore)"
-
-else
-
-LIBMAPI_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy
-
-ADDITIONAL_INCLUDE_DIRS += $(LIBMAPI_CFLAGS) -I../SoObjects -I../SOPE
-ADDITIONAL_LIB_DIRS += -L../SOGo/SOGo.framework/ -lSOGo -L../SOPE/GDLContentStore/obj/ $(LIBMAPI_LIBS)
-
-SAMBA_LIB_DIR = $(shell pkg-config libmapistore --variable=libdir)
+BACKEND_VERSION = 1.0.0
 
+### bootstrap library
 MAPISTORESOGO = MAPIStoreSOGo
-$(MAPISTORESOGO)_VERSION = 1.0.0
 LIBRARY_NAME = $(MAPISTORESOGO)
+
+$(MAPISTORESOGO)_VERSION = $(BACKEND_VERSION)
 $(MAPISTORESOGO)_INSTALL_DIR = $(SAMBA_LIB_DIR)/mapistore_backends
 
 $(MAPISTORESOGO)_OBJC_FILES += \
+	MAPIStoreSOGo.m
+
+### backend bundle
+SOGOBACKEND = SOGoBackend
+BUNDLE_NAME = $(SOGOBACKEND)
+BUNDLE_EXTENSION = .MAPIStore
+BUNDLE_INSTALL_DIR = $(SOGO_LIBDIR)
+
+$(SOGOBACKEND)_PRINCIPAL_CLASS = MAPIApplication
+
+$(SOGOBACKEND)_OBJC_FILES += \
 	MAPIApplication.m \
 	MAPIStoreAuthenticator.m \
 	MAPIStoreContext.m \
 	MAPIStoreMapping.m \
-	MAPIStoreSOGo.m \
 	\
 	MAPIStoreCalendarContext.m \
 	MAPIStoreContactsContext.m \
@@ -38,13 +36,36 @@ $(MAPISTORESOGO)_OBJC_FILES += \
 	MAPIStoreTasksContext.m \
 	\
 	SOGoGCSFolder+MAPIStore.m \
+	SOGoContactGCSEntry+MAPIStore.m \
 	\
 	NSArray+MAPIStore.m \
 	NSData+MAPIStore.m \
 	NSDate+MAPIStore.m \
 	NSString+MAPIStore.m
 
+$(SOGOBACKEND)_RESOURCE_FILES += \
+	product.plist
+
+### cflags and libs
+LIBMAPI_CFLAGS = $(shell pkg-config libmapistore --cflags)
+
+ifeq ($(LIBMAPI_CFLAGS),)
+all install::
+	@echo "Cannot build the OpenChange SOGo backend (empty CFLAGS for libmapistore)"
+else
+
+LIBMAPI_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy
+
+ADDITIONAL_INCLUDE_DIRS += $(LIBMAPI_CFLAGS) -I../SoObjects -I../SOPE -DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" -DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\""
+ADDITIONAL_LIB_DIRS += -Wl,--as-needed \
+	-L../SOGo/SOGo.framework/ -lSOGo \
+	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
+	 $(LIBMAPI_LIBS)
+
+SAMBA_LIB_DIR = $(shell pkg-config libmapistore --variable=libdir)
+
 -include GNUmakefile.preamble
+include $(GNUSTEP_MAKEFILES)/bundle.make
 include $(GNUSTEP_MAKEFILES)/library.make
 -include GNUmakefile.postamble
 
diff --git a/OpenChange/product.plist b/OpenChange/product.plist
new file mode 100644
index 000000000..87075ccfb
--- /dev/null
+++ b/OpenChange/product.plist
@@ -0,0 +1,3 @@
+{
+  requires = ( MAIN, Appointments, Contacts, Mailer );
+}