diff --git a/mozilla/suite/installer/windows/nsis/installer.nsi b/mozilla/suite/installer/windows/nsis/installer.nsi
index 80ee28eaa31..86a1eb52fbc 100644
--- a/mozilla/suite/installer/windows/nsis/installer.nsi
+++ b/mozilla/suite/installer/windows/nsis/installer.nsi
@@ -53,6 +53,7 @@ CRCCheck on
 !system 'echo ; > options.ini'
 !system 'echo ; > components.ini'
 !system 'echo ; > shortcuts.ini'
+!system 'echo ; > summary.ini'
 
 Var TmpVal
 Var StartMenuDir
@@ -124,6 +125,7 @@ ShowInstDetails nevershow
 ReserveFile options.ini
 ReserveFile components.ini
 ReserveFile shortcuts.ini
+ReserveFile summary.ini
 
 ################################################################################
 # Modern User Interface - MUI
@@ -176,6 +178,9 @@ Page custom preShortcuts leaveShortcuts
 !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
 !insertmacro MUI_PAGE_STARTMENU Application $StartMenuDir
 
+; Custom Summary Page
+Page custom preSummary
+
 ; Install Files Page
 !define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveInstFiles
 !insertmacro MUI_PAGE_INSTFILES
@@ -1049,6 +1054,21 @@ Function preStartMenu
   ${EndIf}
 FunctionEnd
 
+Function preSummary
+  !insertmacro createSummaryINI
+  !insertmacro MUI_HEADER_TEXT "$(SUMMARY_PAGE_TITLE)" "$(SUMMARY_PAGE_SUBTITLE)"
+
+  ; The Summary custom page has a textbox that will automatically receive
+  ; focus. This sets the focus to the Install button instead.
+  !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "summary.ini"
+  GetDlgItem $0 $HWNDPARENT 1
+  System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i"
+
+  ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND"                  
+  SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"      
+  !insertmacro MUI_INSTALLOPTIONS_SHOW
+FunctionEnd
+
 Function leaveInstFiles
   FileClose $fhUninstallLog
   ; Diff and add missing entries from the previous file log if it exists
@@ -1207,6 +1227,7 @@ Function .onInit
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "options.ini"
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "components.ini"
   !insertmacro MUI_INSTALLOPTIONS_EXTRACT "shortcuts.ini"
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "summary.ini"
   !insertmacro createBasicCustomOptionsINI
   !insertmacro createSuiteComponentsINI
   !insertmacro createShortcutsINI
diff --git a/mozilla/suite/locales/en-US/installer/windows/custom.properties b/mozilla/suite/locales/en-US/installer/windows/custom.properties
index 2810142873b..4213cc7f6bb 100644
--- a/mozilla/suite/locales/en-US/installer/windows/custom.properties
+++ b/mozilla/suite/locales/en-US/installer/windows/custom.properties
@@ -71,6 +71,10 @@ OPTIONS_PAGE_TITLE=Setup Type
 OPTIONS_PAGE_SUBTITLE=Choose setup options
 SHORTCUTS_PAGE_TITLE=Set Up Shortcuts
 SHORTCUTS_PAGE_SUBTITLE=Create Program Icons
+SUMMARY_PAGE_TITLE=Summary
+SUMMARY_PAGE_SUBTITLE=Ready to start installing ${BrandShortName}
+SUMMARY_INSTALLED_TO=${BrandShortName} will be installed to the following location:
+SUMMARY_CLICK=Click Install to continue.
 SURVEY_TEXT=&Tell us what you thought of ${BrandShortName}
 LAUNCH_TEXT=&Launch ${BrandFullName} now
 WARN_APP_RUNNING_INSTALL=${BrandFullName} must be closed to proceed with the installation.\n\nClick "OK" to exit ${BrandFullName} automatically and continue.