diff --git a/rEFIt_UEFI/Platform/Settings.cpp b/rEFIt_UEFI/Platform/Settings.cpp
index 09bc8e143..ec476a77e 100644
--- a/rEFIt_UEFI/Platform/Settings.cpp
+++ b/rEFIt_UEFI/Platform/Settings.cpp
@@ -127,13 +127,15 @@ const INTN BCSMargin = 11;
 DRIVERS_FLAGS gDriversFlags;  //the initializer is not needed for global variables
 
 #ifdef FIRMWARE_REVISION
-//CONST CHAR16 gFirmwareRevisionM[] = FIRMWARE_REVISION;
-//CONST CHAR16 *gFirmwareRevision = &gFirmwareRevisionM[0];
 CONST CHAR16 *gFirmwareRevision = FIRMWARE_REVISION;
 CONST CHAR8* gRevisionStr = REVISION_STR;
+CONST CHAR8* gFirmwareBuildDate = FIRMWARE_BUILDDATE;
+CONST CHAR8* gBuildInfo = BUILDINFOS_STR;
 #else
-CONST CHAR16 *gFirmwareRevision = NULL;
-CONST CHAR8* gRevisionStr = NULL;
+CONST CHAR16 *gFirmwareRevision = "unknown";
+CONST CHAR8* gRevisionStr = "unknown";
+CONST CHAR8* gFirmwareBuildDate = "unknown";
+CONST CHAR8* gBuildInfo = NULL;
 #endif
 
 EFI_GUID            gUuid;
diff --git a/rEFIt_UEFI/Platform/Settings.h b/rEFIt_UEFI/Platform/Settings.h
index e656e0ff8..a728ce94d 100644
--- a/rEFIt_UEFI/Platform/Settings.h
+++ b/rEFIt_UEFI/Platform/Settings.h
@@ -667,6 +667,8 @@ extern CHAR16                         *IconFormat;
 
 extern CONST CHAR16                   *gFirmwareRevision;
 extern CONST CHAR8* gRevisionStr;
+extern CONST CHAR8* gFirmwareBuildDate;
+extern CONST CHAR8* gBuildInfo;
 
 extern BOOLEAN                        ResumeFromCoreStorage;
 extern BOOLEAN                        gRemapSmBiosIsRequire;  // syscl: pass argument for Dell SMBIOS here
diff --git a/rEFIt_UEFI/Platform/smbios.cpp b/rEFIt_UEFI/Platform/smbios.cpp
index 9ca0d1019..c6a3bd565 100644
--- a/rEFIt_UEFI/Platform/smbios.cpp
+++ b/rEFIt_UEFI/Platform/smbios.cpp
@@ -1105,11 +1105,7 @@ VOID PatchTableType11()
   //  AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.EfiVersion, iStrLen(gSettings.EfiVersion, 64));
   AsciiStrCatS(OEMString, MAX_OEM_STRING, "  Board-ID       : ");
   AsciiStrnCatS(OEMString, MAX_OEM_STRING, gSettings.BoardNumber, iStrLen(gSettings.BoardNumber, 64));
-//#ifdef REVISION_STR
-//	snprintf(TempRev, MAX_OEM_STRING, "\n⌘  Powered by %s\n", REVISION_STR);
-//#else
-  snprintf(TempRev, MAX_OEM_STRING, "\n⌘  Powered by Clover %ls\n", gFirmwareRevision);
-//#endif
+	snprintf(TempRev, MAX_OEM_STRING, "\n⌘  Powered by Clover %s\n", gRevisionStr);
   AsciiStrCatS(OEMString, MAX_OEM_STRING, TempRev);
 
   UpdateSmbiosString(newSmbiosTable, &newSmbiosTable.Type11->StringCount, OEMString);
diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp
index 1d04abcc1..016f02c48 100644
--- a/rEFIt_UEFI/refit/main.cpp
+++ b/rEFIt_UEFI/refit/main.cpp
@@ -1957,12 +1957,10 @@ RefitMain (IN EFI_HANDLE           ImageHandle,
     MsgLog("Now is %02d.%02d.%d,  %02d:%02d:%02d (GMT+%d)\n",
       Now.Day, Now.Month, Now.Year, Now.Hour, Now.Minute, Now.Second, GlobalConfig.Timezone);
   }
-  //MsgLog("Starting Clover rev %ls on %ls EFI\n", FIRMWARE_REVISION, gST->FirmwareVendor);
+  //MsgLog("Starting Clover rev %ls on %ls EFI\n", gFirmwareRevision, gST->FirmwareVendor);
 	MsgLog("Starting %s on %ls EFI\n", gRevisionStr, gST->FirmwareVendor);
 
-  #ifdef BUILDINFOS_STR
-    DBG("Build with: [%s]\n", BUILDINFOS_STR);
-  #endif // BUILDINFOS_STR
+	if ( gBuildInfo ) DBG("Build with: [%s]\n", gBuildInfo);
 
 
   Status = InitRefitLib(gImageHandle);
@@ -2026,10 +2024,6 @@ RefitMain (IN EFI_HANDLE           ImageHandle,
 
   PrepatchSmbios();
 
-//#ifdef REVISION_STR
-//  DBG(REVISION_STR);
-//#endif
-
   //replace / with _
   Size = iStrLen(gSettings.OEMProduct, 64);
   for (i=0; i<Size; i++) {
diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp
index e3c9c47a6..6bdf2e485 100644
--- a/rEFIt_UEFI/refit/menu.cpp
+++ b/rEFIt_UEFI/refit/menu.cpp
@@ -1217,16 +1217,9 @@ VOID AboutRefit(VOID)
 
   if (AboutMenu.Entries.size() == 0) {
 //    AboutMenu.AddMenuInfo_f(("Clover Version 5.0"));
-#ifdef REVISION_STR
-	  AboutMenu.AddMenuInfo_f(" %s ", REVISION_STR);
-#else
+	  AboutMenu.AddMenuInfo_f(" %s ", gRevisionStr);
 	  AboutMenu.AddMenuInfo_f("Clover Revision %ls", gFirmwareRevision);
-#endif
-#ifdef FIRMWARE_BUILDDATE
-    AboutMenu.AddMenuInfo_f(" Build: %s", FIRMWARE_BUILDDATE);
-#else
-    AboutMenu.AddMenuInfo_f(" Build: unknown");
-#endif
+    AboutMenu.AddMenuInfo_f(" Build: %s", gFirmwareBuildDate);
     AboutMenu.AddMenuInfo_f(" ");
     AboutMenu.AddMenuInfo_f("Based on rEFIt (c) 2006-2010 Christoph Pfisterer");
     AboutMenu.AddMenuInfo_f("Portions Copyright (c) Intel Corporation");