diff --git a/bugreport/bugreport.c b/bugreport/bugreport.c
index ccca5e3..6548417 100644
--- a/bugreport/bugreport.c
+++ b/bugreport/bugreport.c
@@ -75,7 +75,8 @@ int main(int argc, char **argv)
     puts("================");
     printf("Package version: %s\n", VERSION);
     printf("Build version: %s\n", BUILD_VERSION);
-    printf("Built on: %s\n", BUILD_DATE);
+    printf("Built on: %s\n", BUILD_HOST);
+    printf("Build date: %s\n", BUILD_DATE);
     printf("version-info %s\n", BUILD_VERSION_INFO_IDENT);
 
     puts("");
diff --git a/version-info b/version-info
index 9ff6929..857072b 100755
--- a/version-info
+++ b/version-info
@@ -34,5 +34,6 @@ fi
 cat <<EOM
 #define BUILD_VERSION "${DESCRIBE}"
 #define BUILD_DATE "$(date +%Y-%m-%dT%H:%M:%S%z)"
+#define BUILD_HOST "$(uname -a)"
 EOM
 echo '#define BUILD_VERSION_INFO_IDENT "$Id$"'