diff --git a/ChangeLog b/ChangeLog
index 8c21310cc..c7bc949bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-02-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoBuild.m: moved from Main/build.h to here.
+
 	* SoObjects/SOGo/SOGoProductLoader.m: moved from Main/ to here.
 
 2010-02-18  Ludovic Marcotte  <lmarcotte@inverse.ca>
diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index 2540897e2..bed1f0ae6 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -5,7 +5,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 include ../Version
 include ./Version
 
-ADDITIONAL_INCLUDE_DIRS += -I../SOPE/ -D_GNU_SOURCE
+ADDITIONAL_INCLUDE_DIRS += 
 ADDITIONAL_LIB_DIRS += -L../SOPE/GDLContentStore/obj/
 
 SOGOD     = sogod
@@ -19,8 +19,7 @@ all::
 $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
-	SOGo+DAV.m		\
-	build.m
+	SOGo+DAV.m
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index bb97c25bf..0a33a3dab 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -1,6 +1,5 @@
 # compile settings
 
-BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
 ADDITIONAL_CPPFLAGS += \
         -D_GNU_SOURCE \
         -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
@@ -10,7 +9,7 @@ ADDITIONAL_CPPFLAGS += \
 ADDITIONAL_INCLUDE_DIRS += \
         -I../SOPE/ \
 	-I../SoObjects/	\
-	-I.. -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\""
+	-I..
 
 ADDITIONAL_LIB_DIRS += \
 	-L../SoObjects/SOGo/SOGo.framework  \
diff --git a/Main/SOGo.m b/Main/SOGo.m
index 4b642e31f..7500fbf99 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -44,6 +44,7 @@
 
 #import <WEExtensions/WEResourceManager.h>
 
+#import <SOGo/SOGoBuild.h>
 #import <SOGo/SOGoCache.h>
 #import <SOGo/SOGoDAVAuthenticator.h>
 #import <SOGo/SOGoPermissions.h>
@@ -57,7 +58,6 @@
 #import <SOGo/WORequest+SOGo.h>
 #import <SOGo/NSObject+DAV.h>
 
-#import "build.h"
 #import "NSException+Stacktrace.h"
 
 #import "SOGo.h"
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index ec948ddb5..a33cf7bd7 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -15,6 +15,7 @@ SOGo_VERSION=$(MAJOR_VERSION).$(MINOR_VERSION)
 # 	SOGoGroupsFolder.h		\
 # 	SOGoGroupFolder.h		
 SOGo_HEADER_FILES = \
+	SOGoBuild.h \
 	SOGoProductLoader.h		\
 	\
 	SOGoCache.h			\
@@ -71,6 +72,7 @@ SOGo_HEADER_FILES = \
 # 	SOGoGroupsFolder.m		\
 # 	SOGoGroupFolder.m		
 SOGo_OBJC_FILES = \
+	SOGoBuild.m \
 	SOGoProductLoader.m		\
 	\
 	SOGoCache.m			\
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index 8b77a61b0..311128242 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -2,8 +2,11 @@
 
 SOGo_INCLUDE_DIRS += -I.. -I../../UI -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
 
+BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
+
 ADDITIONAL_CPPFLAGS += \
-	-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
+        -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
+        -DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""
 
 SOGo_LIBRARIES_DEPEND_UPON += \
 	-L../../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \
diff --git a/Main/build.h b/SoObjects/SOGo/SOGoBuild.h
similarity index 100%
rename from Main/build.h
rename to SoObjects/SOGo/SOGoBuild.h
diff --git a/Main/build.m b/SoObjects/SOGo/SOGoBuild.m
similarity index 100%
rename from Main/build.m
rename to SoObjects/SOGo/SOGoBuild.m
diff --git a/UI/SOGoUI/UIxComponent.m b/UI/SOGoUI/UIxComponent.m
index 230b653b6..922740326 100644
--- a/UI/SOGoUI/UIxComponent.m
+++ b/UI/SOGoUI/UIxComponent.m
@@ -26,8 +26,6 @@
 #import <Foundation/NSPathUtilities.h>
 #import <Foundation/NSString.h>
 
-#import <Main/build.h>
-
 #import <NGObjWeb/SoHTTPAuthenticator.h>
 #import <NGObjWeb/SoObjects.h>
 #import <NGObjWeb/WOResourceManager.h>
@@ -41,6 +39,7 @@
 #import <SOGo/NSCalendarDate+SOGo.h>
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/NSString+Utilities.h>
+#import <SOGo/SOGoBuild.h>
 #import <SOGo/SOGoContentObject.h>
 #import <SOGo/SOGoObject.h>
 #import <SOGo/SOGoPermissions.h>