diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h
index 72292afc46..826d512bdc 100644
--- a/base/setup/lib/muifonts.h
+++ b/base/setup/lib/muifonts.h
@@ -11,6 +11,7 @@ MUI_SUBFONT LatinFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Tahoma" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -37,6 +38,7 @@ MUI_SUBFONT CyrillicFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Tahoma" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -63,6 +65,7 @@ MUI_SUBFONT GreekFonts[] =
     { L"Helv",                   L"DejaVu Sans" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"DejaVu Sans" },
     { L"MS Sans Serif",          L"DejaVu Sans" },
     { L"MS Shell Dlg",           L"DejaVu Sans" },
     { L"MS Shell Dlg 2",         L"DejaVu Sans" },
@@ -89,6 +92,7 @@ MUI_SUBFONT HebrewFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Tahoma" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Tahoma" },
     { L"MS Sans Serif",          L"Tahoma" },
     { L"MS Shell Dlg",           L"Tahoma" },
     { L"MS Shell Dlg 2",         L"Tahoma" },
@@ -121,6 +125,7 @@ MUI_SUBFONT ChineseSimplifiedFonts[] =
     { L"Helv",                   L"Droid Sans Fallback" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",          L"Droid Sans Fallback" },
     { L"MS Shell Dlg",           L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",         L"Droid Sans Fallback" },
@@ -163,6 +168,7 @@ MUI_SUBFONT ChineseTraditionalFonts[] =
     { L"Helv",            L"Droid Sans Fallback" },
     { L"Helvetica",       L"Liberation Sans" },
     { L"Lucida Console",  L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -206,6 +212,7 @@ MUI_SUBFONT JapaneseFonts[] =
     { L"Helv",            L"Droid Sans Fallback" },
     { L"Helvetica",       L"Liberation Sans" },
     { L"Lucida Console",  L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -250,6 +257,7 @@ MUI_SUBFONT KoreanFonts[] =
     { L"Helv",            L"Droid Sans Fallback" },
     { L"Helvetica",       L"Liberation Sans" },
     { L"Lucida Console",  L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Sans Serif",   L"Droid Sans Fallback" },
     { L"MS Shell Dlg",    L"Droid Sans Fallback" },
     { L"MS Shell Dlg 2",  L"Droid Sans Fallback" },
@@ -293,6 +301,7 @@ MUI_SUBFONT UnicodeFonts[] =
     { L"Helv",                   L"DejaVu Sans" },
     { L"Helvetica",              L"DejaVu Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"DejaVu Sans" },
     { L"MS Sans Serif",          L"DejaVu Sans" },
     { L"MS Shell Dlg",           L"DejaVu Sans" },
     { L"MS Shell Dlg 2",         L"DejaVu Sans" },
@@ -320,6 +329,7 @@ MUI_SUBFONT HindiFonts[] =
     { L"Helv",                   L"Tahoma" },
     { L"Helvetica",              L"Liberation Sans" },
     { L"Lucida Console",         L"DejaVu Sans Mono" },
+    { L"Microsoft Sans Serif",   L"FreeSans" },
     { L"MS Sans Serif",          L"FreeSans" },
     { L"MS Shell Dlg",           L"FreeSans" },
     { L"MS Shell Dlg 2",         L"FreeSans" },
diff --git a/boot/bootdata/livecd.inf b/boot/bootdata/livecd.inf
index fda2356a97..dd44f0ed53 100644
--- a/boot/bootdata/livecd.inf
+++ b/boot/bootdata/livecd.inf
@@ -50,6 +50,7 @@ HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Fixedsys",0
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helv",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Helvetica",0x00000000,"Liberation Sans"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Lucida Console",0x00000000,"DejaVu Sans Mono"
+HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","Microsoft Sans Serif",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Sans Serif",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg",0x00000000,"Tahoma"
 HKLM,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\FontSubstitutes","MS Shell Dlg 2",0x00000000,"Tahoma"