diff --git a/SConstruct b/SConstruct
index f4027acaed6..1d5fc539170 100644
--- a/SConstruct
+++ b/SConstruct
@@ -587,7 +587,7 @@ env.Alias('data-dist', data_tarball)
 # Windows installer
 #
 
-env.WindowsInstaller([wesnoth, wesnoth_editor, Dir(installable_subs)] + glob("*.dll") + Split("README copyright COPYING"))
+env.WindowsInstaller([wesnoth, wesnoth_editor, wesnothd, Dir(installable_subs)] + glob("*.dll") + Split("README copyright COPYING"))
 
 #
 # Making Mac OS X application bundles
diff --git a/packaging/windows/Wesnoth.nsi.in b/packaging/windows/Wesnoth.nsi.in
index 72a350e21de..495005b89ca 100644
--- a/packaging/windows/Wesnoth.nsi.in
+++ b/packaging/windows/Wesnoth.nsi.in
@@ -32,6 +32,7 @@
 ;--------------------------------
 ;Interface Settings
 
+  !define MUI_WELCOMEFINISHPAGE_BITMAP packaging\windows\WindowsInstallerGraphic.bmp
   !define MUI_ABORTWARNING
 
 ;--------------------------------
@@ -45,6 +46,7 @@
 ;--------------------------------
 ;Pages
 
+  !insertmacro MUI_PAGE_WELCOME
   !insertmacro MUI_PAGE_LICENSE "COPYING"
   !insertmacro MUI_PAGE_COMPONENTS
   !insertmacro MUI_PAGE_DIRECTORY
@@ -57,6 +59,9 @@
   !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder
 
   !insertmacro MUI_PAGE_INSTFILES
+
+  !define MUI_FINISHPAGE_RUN wesnoth.exe
+  !define MUI_PAGE_FINISH
   
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES