diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index d8ae4c06d6..32bc96dc57 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,7 +3,7 @@ DIST_SUBDIRS = osx suse
 
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh
+EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh 
 
 conf_DATA = tor-tsocks.conf
 
diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh
index 433c51cfeb..b38fcd71e4 100644
--- a/contrib/package_nsis-mingw.sh
+++ b/contrib/package_nsis-mingw.sh
@@ -22,6 +22,7 @@ cp src/or/tor.exe win_tmp/bin/
 cp src/tools/tor-resolve.exe win_tmp/bin/
 cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin/
 cp /usr/local/ssl/lib/libssl.a win_tmp/bin/
+cp contrib/tor.ico win_tmp/bin/
 
 # There is no man2html in mingw.  
 # Maybe we should add this into make dist instead.
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index bcadaeecd4..918a69a64f 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -24,6 +24,7 @@ Name "Tor"
 Caption "Tor ${VERSION} Setup"
 BrandingText "The Onion Router"
 CRCCheck on
+XPStyle on
 
 ;Use upx on the installer header to shrink the size.
 !packhdr header.dat "upx --best header.dat"
@@ -66,6 +67,7 @@ Section "Tor" Tor
    SetOutPath $INSTDIR
    File "${BIN}\tor.exe"
    File "${BIN}\tor-resolve.exe"
+   File "${BIN}\tor.ico"
    WriteIniStr "$INSTDIR\Tor Website.url" "InternetShortcut" "URL" ${WEBSITE}
 
    StrCpy $configfile "torrc"
@@ -123,7 +125,7 @@ Section "Start Menu" StartMenu
    IfFileExists "$SMPROGRAMS\Tor\*.*" "" +2
       RMDir /r "$SMPROGRAMS\Tor"
    CreateDirectory "$SMPROGRAMS\Tor"
-   CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\tor.exe"
+   CreateShortCut "$SMPROGRAMS\Tor\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" 
    CreateShortCut "$SMPROGRAMS\Tor\Torrc.lnk" "Notepad.exe" "$configdir\torrc"
    CreateShortCut "$SMPROGRAMS\Tor\Tor Website.lnk" "$INSTDIR\Tor Website.url"
    CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
@@ -137,12 +139,12 @@ SectionEnd
 
 Section "Desktop" Desktop
    SetOutPath $INSTDIR
-   CreateShortCut "$DESKTOP\Tor.lnk" "$INSTDIR\tor.exe"
+   CreateShortCut "$DESKTOP\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" 
 SectionEnd
 
 Section /o "Run at startup" Startup
    SetOutPath $INSTDIR
-   CreateShortCut "$SMSTARTUP\Tor.lnk" "$INSTDIR\tor.exe" "" "" 0 SW_SHOWMINIMIZED
+   CreateShortCut "$SMSTARTUP\Tor.lnk" "$INSTDIR\tor.exe" "" "$INSTDIR\tor.ico" "" SW_SHOWMINIMIZED
 SectionEnd
 
 SubSectionEnd
@@ -156,6 +158,7 @@ Section "Uninstall"
    Delete "$INSTDIR\Tor Website.url"
    Delete "$INSTDIR\torrc"
    Delete "$INSTDIR\torrc.sample"
+   Delete "$INSTDIR\tor.ico"
    StrCmp $configdir $INSTDIR +2 ""
       RMDir /r $configdir
    Delete "$INSTDIR\Uninstall.exe"
diff --git a/contrib/tor.ico b/contrib/tor.ico
new file mode 100644
index 0000000000..a69bab48f0
Binary files /dev/null and b/contrib/tor.ico differ