Index: /trunk/src/VBox/VMM/Makefile.kmk
===================================================================
--- /trunk/src/VBox/VMM/Makefile.kmk	(revision 22780)
+++ /trunk/src/VBox/VMM/Makefile.kmk	(revision 22781)
@@ -187,4 +187,9 @@
 	VMMSwitcher/AMD64ToPAE.asm
 
+# SSM wish to know the build type, host os and arch.
+SSM.cpp_DEFS +=	\
+	KBUILD_TYPE=\"$(KBUILD_TYPE)\" \
+	KBUILD_TARGET=\"$(KBUILD_TARGET)\" \
+	KBUILD_TARGET_ARCH=\"$(KBUILD_TARGET_ARCH)\"
 
 #
Index: /trunk/src/VBox/VMM/SSM.cpp
===================================================================
--- /trunk/src/VBox/VMM/SSM.cpp	(revision 22780)
+++ /trunk/src/VBox/VMM/SSM.cpp	(revision 22781)
@@ -838,11 +838,8 @@
      * Terminated by two empty strings.
      */
-#ifdef DEBUG
     SSMR3PutStrZ(pSSM, "Build Type");
-    SSMR3PutStrZ(pSSM, "debug");
-#elif defined(VBOX_STRICT)
-    SSMR3PutStrZ(pSSM, "Build Type");
-    SSMR3PutStrZ(pSSM, "strict");
-#endif
+    SSMR3PutStrZ(pSSM, KBUILD_TYPE);
+    SSMR3PutStrZ(pSSM, "Host OS");
+    SSMR3PutStrZ(pSSM, KBUILD_TARGET "." KBUILD_TARGET_ARCH);
 #ifdef VBOX_OSE
     SSMR3PutStrZ(pSSM, "OSE");