diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile
index 7452c39fc..a28abc6d3 100644
--- a/OpenChange/GNUmakefile
+++ b/OpenChange/GNUmakefile
@@ -172,12 +172,12 @@ LIBMAPISTORE_CFLAGS = $(shell pkg-config libmapistore --cflags) -DSAMBA_PREFIX="
 LIBMAPISTORE_LIBS = $(shell pkg-config libmapistore --libs) -lmapiproxy
 
 $(MAPISTORESOGO)_INSTALL_DIR = $(DESTDIR)/$(SAMBA_LIB_DIR)/mapistore_backends
-$(MAPISTORESOGO)_LDFLAGS += \
+$(MAPISTORESOGO)_LIB_DIRS += \
         -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
 	$(LIBMAPI_LIBS) \
 	$(LIBMAPISTORE_LIBS)
 
-$(SOGOBACKEND)_LDFLAGS += \
+$(SOGOBACKEND)_LIB_DIRS += \
         -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ -lOGoContentStore \
         -L../SoObjects/SOGo/SOGo.framework/ -lSOGo \
 	$(LIBMAPI_LIBS) \
diff --git a/Version b/Version
index 640430005..09503ebca 100644
--- a/Version
+++ b/Version
@@ -2,6 +2,6 @@
 # This file is included by library makefiles to set the version information
 # of the executable.
 
-MAJOR_VERSION=1
-MINOR_VERSION=3
-SUBMINOR_VERSION=12
+MAJOR_VERSION=2
+MINOR_VERSION=0
+SUBMINOR_VERSION=0