diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index a946c78ca..521a76294 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -3,7 +3,6 @@
 include ../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
-include ./Version
 
 ADDITIONAL_INCLUDE_DIRS += 
 ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile
index a3d3cebfa..bcc0817b3 100644
--- a/SoObjects/Appointments/GNUmakefile
+++ b/SoObjects/Appointments/GNUmakefile
@@ -45,7 +45,6 @@ Appointments_OBJC_FILES = \
 	SOGoEMailAlarmsManager.m
 
 Appointments_RESOURCE_FILES +=		\
-	Version				\
 	product.plist			\
 
 Appointments_LANGUAGES = BrazilianPortuguese Catalan Czech Dutch English French German Hungarian Italian Norwegian Polish Russian Spanish Swedish Ukrainian Welsh
diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile
index c110598f5..1af789879 100644
--- a/SoObjects/Contacts/GNUmakefile
+++ b/SoObjects/Contacts/GNUmakefile
@@ -22,7 +22,6 @@ Contacts_OBJC_FILES =			\
 	SOGoContactEntryPhoto.m		\
 
 Contacts_RESOURCE_FILES +=		\
-	Version				\
 	product.plist			\
 
 Contacts_LANGUAGES = BrazilianPortuguese Catalan Czech Dutch English French German Hungarian Italian Norwegian Polish Russian Spanish Swedish Ukrainian Welsh
diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile
index e75e0437a..677807c86 100644
--- a/SoObjects/Mailer/GNUmakefile
+++ b/SoObjects/Mailer/GNUmakefile
@@ -41,7 +41,6 @@ Mailer_OBJC_FILES += \
 	SOGoUser+Mailer.m
 
 Mailer_RESOURCE_FILES += \
-	Version		\
 	product.plist	\
 
 Mailer_RESOURCE_FILES += \
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index c76b79c47..f3464af79 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -2,14 +2,13 @@
 
 include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
--include ../../Version
--include ./Version
+include ../../Version
 
 FRAMEWORK_NAME = SOGo
 
 SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
 
-SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
+SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
 
 SOGo_HEADER_FILES = \
 	SOGoBuild.h \
diff --git a/SoObjects/common.make b/SoObjects/common.make
index 0232c3894..f28886d92 100644
--- a/SoObjects/common.make
+++ b/SoObjects/common.make
@@ -3,7 +3,6 @@
 include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
-include ./Version
 
 NEEDS_GUI=no
 BUNDLE_EXTENSION     = .SOGo
diff --git a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile
index d1f938dab..fb5d5aaac 100644
--- a/UI/AdministrationUI/GNUmakefile
+++ b/UI/AdministrationUI/GNUmakefile
@@ -15,7 +15,6 @@ AdministrationUI_OBJC_FILES =		\
 	UIxAdministrationFilterPanel.m
 
 AdministrationUI_RESOURCE_FILES += \
-	Version		\
 	product.plist	
 
 AdministrationUI_RESOURCE_FILES += \
diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index 37dd5dff1..95b5c18ed 100644
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -23,7 +23,6 @@ CommonUI_OBJC_FILES +=		\
 	WODirectAction+SOGo.m \
 
 CommonUI_RESOURCE_FILES += \
-	Version			\
 	product.plist
 
 
diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile
index faf5f3791..7df81e254 100644
--- a/UI/Contacts/GNUmakefile
+++ b/UI/Contacts/GNUmakefile
@@ -25,7 +25,6 @@ ContactsUI_OBJC_FILES =			\
 	UIxContactFolderActions.m 
 
 ContactsUI_RESOURCE_FILES +=		\
-	Version				\
 	product.plist			\
 
 ContactsUI_RESOURCE_FILES +=		\
diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile
index 9d0f3b001..671ec7d53 100644
--- a/UI/MailPartViewers/GNUmakefile
+++ b/UI/MailPartViewers/GNUmakefile
@@ -28,7 +28,6 @@ MailPartViewers_OBJC_FILES += \
 	UIxMailPartICalActions.m	\
 
 MailPartViewers_RESOURCE_FILES += \
-	Version			\
 	product.plist		\
 
 MailPartViewers_LOCALIZED_RESOURCE_FILES += \
diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile
index 1753182da..31ed3a4a4 100644
--- a/UI/MailerUI/GNUmakefile
+++ b/UI/MailerUI/GNUmakefile
@@ -39,7 +39,6 @@ MailerUI_OBJC_FILES += \
 # 	UIxFilterList.m			\
 
 MailerUI_RESOURCE_FILES += \
-	Version		\
 	product.plist	\
 	Toolbars/*.toolbar
 
diff --git a/UI/MailerUI/GNUmakefile.preamble b/UI/MailerUI/GNUmakefile.preamble
index 57d2fe27d..d86a79d5e 100644
--- a/UI/MailerUI/GNUmakefile.preamble
+++ b/UI/MailerUI/GNUmakefile.preamble
@@ -2,6 +2,6 @@
 
 ADDITIONAL_CPPFLAGS += \
         -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
-        -DUIX_MAILER_MAJOR_VERSION=$(MAJOR_VERSION)   \
-        -DUIX_MAILER_MINOR_VERSION=$(MINOR_VERSION)   \
-        -DUIX_MAILER_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+        -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION)   \
+        -DSOGO_MINOR_VERSION=$(MINOR_VERSION)   \
+        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile
index 8795657d4..b1321d95d 100644
--- a/UI/MainUI/GNUmakefile
+++ b/UI/MainUI/GNUmakefile
@@ -15,7 +15,6 @@ MainUI_OBJC_FILES += \
 	SOGoBrowsersPanel.m	\
 
 MainUI_RESOURCE_FILES += 	\
-	Version			\
 	product.plist		\
 	SOGoProfile.sql \
 	SOGoProfile-oracle.sql \
diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile
index 8846ec826..ac91c391f 100644
--- a/UI/PreferencesUI/GNUmakefile
+++ b/UI/PreferencesUI/GNUmakefile
@@ -18,7 +18,6 @@ PreferencesUI_OBJC_FILES =		\
 	UIxAdditionalPreferences.m
 
 PreferencesUI_RESOURCE_FILES += \
-	Version		\
 	product.plist	
 
 PreferencesUI_RESOURCE_FILES += \
diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile
index 385515bf5..2b781caed 100644
--- a/UI/SOGoUI/GNUmakefile
+++ b/UI/SOGoUI/GNUmakefile
@@ -4,7 +4,6 @@ include ../common.make
 -include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
-include ./Version 
 
 LIBRARY_NAME = libSOGoUI
 
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index c2ac33234..79f104945 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -48,7 +48,6 @@ SchedulerUI_OBJC_FILES =		\
 	UIxOccurenceDialog.m
 
 SchedulerUI_RESOURCE_FILES += \
-	Version		\
 	product.plist	
 
 SchedulerUI_RESOURCE_FILES += \
diff --git a/UI/common.make b/UI/common.make
index 4de72e898..60288a7ac 100644
--- a/UI/common.make
+++ b/UI/common.make
@@ -3,7 +3,6 @@
 include ../../config.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../../Version
--include ./Version
 
 NEEDS_GUI=no
 BUNDLE_EXTENSION   = .SOGo
diff --git a/Version b/Version
index 508b69a9a..47c975e7f 100644
--- a/Version
+++ b/Version
@@ -4,3 +4,7 @@
 
 MAJOR_VERSION=1
 MINOR_VERSION=3
+SUBMINOR_VERSION=6
+
+SOPE_MAJOR_VERSION=4
+SOPE_MINOR_VERSION=9
diff --git a/configure b/configure
index c84dea1fd..f0ac4ef20 100755
--- a/configure
+++ b/configure
@@ -225,12 +225,6 @@ genConfigMake() {
   #cfgwrite "	@echo Local GNUstep config.make is active"
   #cfgwrite ""
 
-  cfgwrite "SOGO_MAJOR_VERSION=0"
-  cfgwrite "SOGO_MINOR_VERSION=9"
-  cfgwrite "SOPE_MAJOR_VERSION=4"
-  cfgwrite "SOPE_MINOR_VERSION=9"
-  cfgwrite ""
-  
   if test $ARG_WITH_DEBUG = 1; then
     cfgwrite "# configured to produce debugging code";
     cfgwrite "debug:=yes"