diff --git a/src/config.c b/src/config.c
index 95d23cea3..373ee130d 100644
--- a/src/config.c
+++ b/src/config.c
@@ -77,6 +77,7 @@
 #include <86box/plat_dir.h>
 #include <86box/ui.h>
 #include <86box/snd_opl.h>
+#include <86box/version.h>
 
 static int   cx;
 static int   cy;
@@ -1884,7 +1885,16 @@ save_general(void)
     else
         ini_section_delete_var(cat, "do_auto_pause");
 
-    if (strnlen(uuid, sizeof(uuid) - 1) > 0)
+    char cpu_buf[128] = { 0 };
+    plat_get_cpu_string(cpu_buf, 128);
+    ini_section_set_string(cat, "host_cpu", cpu_buf);
+
+    if (EMU_BUILD_NUM != 0)
+        ini_section_set_int(cat, "emu_build_num", EMU_BUILD_NUM);
+    else
+        ini_section_delete_var(cat, "emu_build_num");
+
+  if (strnlen(uuid, sizeof(uuid) - 1) > 0)
         ini_section_set_string(cat, "uuid", uuid);
     else
         ini_section_delete_var(cat, "uuid");
diff --git a/src/qt/qt_platform.cpp b/src/qt/qt_platform.cpp
index c7cc76ffe..275d1df2e 100644
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -686,7 +686,7 @@ plat_get_cpu_string(char *outbuf, uint8_t len) {
         return;
     }
     QByteArray result = process->readAll();
-    auto command_result = QString(result).split(": ").last();
+    auto command_result = QString(result).split(": ").last().trimmed();
     if(!command_result.isEmpty()) {
         cpu_string = command_result;
     }