diff --git a/Main/GNUmakefile b/Main/GNUmakefile
index bed1f0ae6..f41a7a6ce 100644
--- a/Main/GNUmakefile
+++ b/Main/GNUmakefile
@@ -12,10 +12,6 @@ SOGOD     = sogod
 TOOL_NAME = $(SOGOD)
 $(SOGOD)_INSTALL_DIR = $(SOGO_ADMIN_TOOLS)
 
-# daemon tool
-all::
-	@touch build.m
-
 $(SOGOD)_OBJC_FILES += \
 	sogod.m			\
 	SOGo.m			\
diff --git a/SoObjects/SOGo/GNUmakefile b/SoObjects/SOGo/GNUmakefile
index a33cf7bd7..441ac374e 100644
--- a/SoObjects/SOGo/GNUmakefile
+++ b/SoObjects/SOGo/GNUmakefile
@@ -68,6 +68,10 @@ SOGo_HEADER_FILES = \
 	WOResponse+SOGo.h		\
 	WOContext+SOGo.h
 
+# daemon tool
+all::
+	@touch SOGoBuild.m
+
 #	SOGoCustomGroupFolder.m		\
 # 	SOGoGroupsFolder.m		\
 # 	SOGoGroupFolder.m		
diff --git a/SoObjects/SOGo/GNUmakefile.preamble b/SoObjects/SOGo/GNUmakefile.preamble
index 311128242..14be9686a 100644
--- a/SoObjects/SOGo/GNUmakefile.preamble
+++ b/SoObjects/SOGo/GNUmakefile.preamble
@@ -2,7 +2,8 @@
 
 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")
+HOSTNAME = $(shell hostname -f)
+BUILD_DATE = $(shell echo $$USER@$(HOSTNAME); date +"%Y%m%d%H%M")
 
 ADDITIONAL_CPPFLAGS += \
         -DSOGO_BUILD_DATE="@\"$(BUILD_DATE)\"" \
diff --git a/SoObjects/SOGo/SOGoBuild.m b/SoObjects/SOGo/SOGoBuild.m
index cc5fa29b8..d8800d191 100644
--- a/SoObjects/SOGo/SOGoBuild.m
+++ b/SoObjects/SOGo/SOGoBuild.m
@@ -23,4 +23,3 @@
 #import <Foundation/NSString.h>
 
 NSString *SOGoBuildDate = SOGO_BUILD_DATE;
-