diff --git a/ChangeLog b/ChangeLog
index d7acd4f58..58d97ec1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* Main/SOGo.m ([SOGo +initialize]): show the build date and
+	hostname at startup.
+
 2007-08-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoCalendarComponent.m
diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index fbc5ae16e..c97beba9d 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -9,11 +9,14 @@ SOGOD     = sogod-$(MAJOR_VERSION).$(MINOR_VERSION)
 TOOL_NAME = $(SOGOD)
 
 # daemon tool
+all::
+	$(RM) obj/build.*
 
 $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
 	SOGoProductLoader.m	\
+	build.m
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/tool.make
diff --git a/Main/GNUmakefile.preamble b/Main/GNUmakefile.preamble
index 6d8c1dc96..991110f9f 100644
--- a/Main/GNUmakefile.preamble
+++ b/Main/GNUmakefile.preamble
@@ -1,5 +1,6 @@
 # compile settings
 
+BUILD_DATE = $(shell echo $$USER@$$HOSTNAME; date +"%Y%m%d%H%M")
 ADDITIONAL_CPPFLAGS += \
         -DSOGO_MAJOR_VERSION=$(MAJOR_VERSION) \
         -DSOGO_MINOR_VERSION=$(MINOR_VERSION) \
@@ -7,7 +8,7 @@ ADDITIONAL_CPPFLAGS += \
 
 ADDITIONAL_INCLUDE_DIRS += \
 	-I../SoObjects/	\
-	-I..
+	-I.. -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\""
 
 ADDITIONAL_LIB_DIRS += \
 	-L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \
diff --git a/Main/SOGo.m b/Main/SOGo.m
index 527d082b6..b4d247f8c 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -46,6 +46,7 @@
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>
 
+#import "build.h"
 #import "SOGoProductLoader.h"
 
 @interface SOGo : SoApplication
@@ -74,6 +75,8 @@ static BOOL debugObjectAllocation = NO;
   SoClassSecurityInfo *sInfo;
   NSArray *basicRoles;
   id tmp;
+
+  NSLog (@"starting SOGo (build %@)", SOGoBuildDate);
   
   doCrashOnSessionCreate = [ud boolForKey:@"SOGoCrashOnSessionCreate"];
 #ifdef GNUSTEP_BASE_LIBRARY
diff --git a/Main/build.h b/Main/build.h
new file mode 100644
index 000000000..d1daeddbd
--- /dev/null
+++ b/Main/build.h
@@ -0,0 +1,28 @@
+/* build.h - this file is part of $PROJECT_NAME_HERE$
+ *
+ * Copyright (C) 2007 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef BUILD_H
+#define BUILD_H
+
+extern NSString *SOGoBuildDate;
+
+#endif /* BUILD_H */
diff --git a/Main/build.m b/Main/build.m
new file mode 100644
index 000000000..9c106e801
--- /dev/null
+++ b/Main/build.m
@@ -0,0 +1,26 @@
+/* build.m - this file is part of SOGo
+ *
+ * Copyright (C) 2007 Inverse groupe conseil
+ *
+ * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#import <Foundation/NSString.h>
+
+NSString *SOGoBuildDate = SOGO_BUILD_DATE;
+