diff --git a/SoObjects/Mailer/GNUmakefile.preamble b/SoObjects/Mailer/GNUmakefile.preamble
index 848ebbb2c..de48776be 100644
--- a/SoObjects/Mailer/GNUmakefile.preamble
+++ b/SoObjects/Mailer/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)
+        -DUIX_MAILER_MAJOR_VERSION="@\"$(MAJOR_VERSION)\""   \
+        -DUIX_MAILER_MINOR_VERSION="@\"$(MINOR_VERSION)\""   \
+        -DUIX_MAILER_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 21a31e4da..1332070c8 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -57,6 +57,7 @@
 #import <SOGo/NSArray+Utilities.h>
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoBuild.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #import <SOGo/SOGoMailer.h>
 #import <SOGo/SOGoUser.h>
@@ -176,10 +177,8 @@ static NSString    *userAgent      = nil;
 {
   MultiMixedType = [NGMimeType mimeType: @"multipart" subType: @"mixed"];
   [MultiMixedType retain];
-  userAgent      = [NSString stringWithFormat: @"SOGoMail %d.%d.%d",
-			     UIX_MAILER_MAJOR_VERSION,
-			     UIX_MAILER_MINOR_VERSION,
-			     UIX_MAILER_SUBMINOR_VERSION];
+  userAgent      = [NSString stringWithFormat: @"SOGoMail %@",
+			     SOGoVersion];
   [userAgent retain];
 }
 
diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index d2f5fdcdd..975463d0e 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -56,7 +56,7 @@ static BOOL debugOn = NO;
          annotations (see davEntityTag below) */
       // if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
       
-      mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
+      mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%@_%@_%@\"",
                                    UIX_MAILER_MAJOR_VERSION,
                                    UIX_MAILER_MINOR_VERSION,
                                    UIX_MAILER_SUBMINOR_VERSION];
diff --git a/SoObjects/Mailer/SOGoMailObject.m b/SoObjects/Mailer/SOGoMailObject.m
index b0cb27cbf..9a73eb92b 100644
--- a/SoObjects/Mailer/SOGoMailObject.m
+++ b/SoObjects/Mailer/SOGoMailObject.m
@@ -85,7 +85,7 @@ static BOOL debugSoParts       = NO;
       /* The following disabled code should not be needed, except if we use
          annotations (see davEntityTag below) */
       // if (![[ud objectForKey: @"SOGoMailDisableETag"] boolValue]) {
-      mailETag = [[NSString alloc] initWithFormat: @"\"imap4url_%d_%d_%03d\"",
+      mailETag = [[NSString alloc] initWithFormat: @"\"imap4url_%@_%@_%@\"",
                                    UIX_MAILER_MAJOR_VERSION,
                                    UIX_MAILER_MINOR_VERSION,
                                    UIX_MAILER_SUBMINOR_VERSION];
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index b965a681f..c2d4e6376 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -9,8 +9,6 @@ FRAMEWORK_NAME = SOGo
 #SOGo_INSTALL_DIR = $(SOGO_LIBDIR)
 SOGo_INSTALL_DIR = $(DESTDIR)$(GNUSTEP_$(GNUSTEP_INSTALLATION_DOMAIN)_FRAMEWORKS)
 
-SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBMINOR_VERSION)
-
 SOGo_HEADER_FILES = \
 	SOGoBuild.h \
 	SOGoProductLoader.h		\
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index f9b0a1515..925df35a0 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -1,16 +1,17 @@
 # compilation settings
 
-SOGo_INCLUDE_DIRS += -I.. -I../../UI \
-	-DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
-	-DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
-	-DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
+SOGo_INCLUDE_DIRS += -I.. -I../../UI 
 
 HOSTNAME ?= $(shell hostname -f)
 BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
 
 ADDITIONAL_CPPFLAGS += \
         -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
-        -DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
+        -DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\"" \
+        -DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \
+        -DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \
+        -DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
+
 
 SOGo_LIBRARIES_DEPEND_UPON += \
         -Wl,--no-as-needed \
diff --git a/UI/MailerUI/GNUmakefile.preamble b/UI/MailerUI/GNUmakefile.preamble
index d86a79d5e..854eba29f 100644
--- a/UI/MailerUI/GNUmakefile.preamble
+++ b/UI/MailerUI/GNUmakefile.preamble
@@ -2,6 +2,6 @@
 
 ADDITIONAL_CPPFLAGS += \
         -Wall -DCOMPILE_FOR_GSTEP_MAKE=1        \
-        -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION)   \
-        -DSOGO_MINOR_VERSION=$(MINOR_VERSION)   \
-        -DSOGO_SUBMINOR_VERSION=$(SUBMINOR_VERSION)
+        -DSOGO_MAJOR_VERSION="@\"$(MAJOR_VERSION)\""   \
+        -DSOGO_MINOR_VERSION="@\"$(MINOR_VERSION)\""   \
+        -DSOGO_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\""
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 9e50186d8..d621aa353 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -67,7 +67,7 @@ static NSString *mailETag = nil;
 
 + (void) initialize
 {
-  mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%d_%d_%03d\"",
+  mailETag = [[NSString alloc] initWithFormat:@"\"imap4url_%@_%@_%@\"",
                                SOGO_MAJOR_VERSION,
                                SOGO_MINOR_VERSION,
                                SOGO_SUBMINOR_VERSION];
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index 52508de50..50d1fba43 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -44,18 +44,19 @@
 #import <Appointments/SOGoAppointmentFolders.h>
 
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoBuild.h>
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoCASSession.h>
+#import <SOGo/SOGoConstants.h>
 #import <SOGo/SOGoDomainDefaults.h>
 #if defined(SAML2_CONFIG)
 #import <SOGo/SOGoSAML2Session.h>
 #endif /* SAML2_ENABLE */
+#import <SOGo/SOGoSession.h>
 #import <SOGo/SOGoSystemDefaults.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserManager.h>
 #import <SOGo/SOGoWebAuthenticator.h>
-#import <SOGo/SOGoSession.h>
-#import <SOGo/SOGoConstants.h>
 
 #import "SOGoRootPage.h"
 
@@ -514,10 +515,7 @@
 {
   NSString *aString;
 
-  aString = [NSString stringWithFormat: @"%d.%d.%d",
-		      SOGO_MAJOR_VERSION,
-		      SOGO_MINOR_VERSION,
-		      SOGO_SUBMINOR_VERSION];
+  aString = [NSString stringWithString: SOGoVersion ];
 
   return aString;
 }