diff --git a/config/rootfiles/common/configroot b/config/rootfiles/common/configroot
index 2c093834f..063a8d5a8 100644
--- a/config/rootfiles/common/configroot
+++ b/config/rootfiles/common/configroot
@@ -40,6 +40,7 @@ var/ipfire/extrahd/devices
 var/ipfire/extrahd/partitions
 var/ipfire/extrahd/scan
 var/ipfire/extrahd/settings
+var/ipfire/firebuild
 var/ipfire/fwlogs
 #var/ipfire/fwlogs/ipsettings
 #var/ipfire/fwlogs/portsettings
diff --git a/config/rootfiles/updater/filelists/other b/config/rootfiles/updater/filelists/other
index 476a7bfef..e7933a5f1 100644
--- a/config/rootfiles/updater/filelists/other
+++ b/config/rootfiles/updater/filelists/other
@@ -19,3 +19,4 @@ srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
 srv/web/ipfire/cgi-bin/connections.cgi
 var/ipfire/sensors/
 var/ipfire/graphs.pl
+var/ipfire/firebuild
diff --git a/make.sh b/make.sh
index bfacc050c..14b4a5e84 100755
--- a/make.sh
+++ b/make.sh
@@ -583,6 +583,14 @@ buildipfire() {
   ipfiremake wpa_supplicant
   ipfiremake hostapd
   ipfiremake urlgrabber
+  echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
+  cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
+  echo >> $BASEDIR/build/var/ipfire/firebuild
+  git log -1 >> $BASEDIR/build/var/ipfire/firebuild
+  echo >> $BASEDIR/build/var/ipfire/firebuild
+  git status >> $BASEDIR/build/var/ipfire/firebuild
+  echo >> $BASEDIR/build/var/ipfire/firebuild
+  cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
 }
 
 buildinstaller() {