diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec
index ef143160..aaa6f42a 100644
--- a/qemu-linux-user.spec
+++ b/qemu-linux-user.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-linux-user
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes
index b6f3764d..402e30d8 100644
--- a/qemu-testsuite.changes
+++ b/qemu-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 11 17:36:17 UTC 2017 - afaerber@suse.de
+
+- sgabios-stable-buildid.patch: Use geeko@buildhost
+
 -------------------------------------------------------------------
 Mon Nov 28 20:21:27 UTC 2016 - afaerber@suse.de
 
diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec
index 4f525dc4..a74f7610 100644
--- a/qemu-testsuite.spec
+++ b/qemu-testsuite.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qemu-testsuite
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/qemu.changes b/qemu.changes
index b6f3764d..402e30d8 100644
--- a/qemu.changes
+++ b/qemu.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jan 11 17:36:17 UTC 2017 - afaerber@suse.de
+
+- sgabios-stable-buildid.patch: Use geeko@buildhost
+
 -------------------------------------------------------------------
 Mon Nov 28 20:21:27 UTC 2016 - afaerber@suse.de
 
diff --git a/qemu.spec b/qemu.spec
index cfc6cc61..730060a0 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package qemu
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
diff --git a/sgabios-stable-buildid.patch b/sgabios-stable-buildid.patch
index 5860aa6c..8f9dfe2a 100644
--- a/sgabios-stable-buildid.patch
+++ b/sgabios-stable-buildid.patch
@@ -5,22 +5,25 @@ builds when the actual code of the package doesn't
 change. (bsc#1011213)
 
 Signed-off-by: Bruce Rogers <brogers@suse.com>
+Signed-off-by: Andreas Färber <afaerber@suse.de>
 ---
  Makefile |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- a/Makefile
 +++ b/Makefile
-@@ -14,9 +14,9 @@
+@@ -14,10 +14,10 @@
  #
  # $Id$
  
 -BUILD_DATE = \"$(shell date -u)\"
 -BUILD_SHORT_DATE = \"$(shell date -u +%D)\"
 -BUILD_HOST = \"$(shell hostname)\"
+-BUILD_USER = \"$(shell whoami)\"
 +BUILD_DATE = \"$(shell date --date='@$(PACKAGING_TIMESTAMP)' -u)\"
 +BUILD_SHORT_DATE = \"$(shell date --date='@$(PACKAGING_TIMESTAMP)' -u +%D)\"
-+BUILD_HOST = \"hostname\"
- BUILD_USER = \"$(shell whoami)\"
++BUILD_HOST = \"buildhost\"
++BUILD_USER = \"geeko\"
  
  CFLAGS := -Wall -Os -m32 -nostdlib
+