Index: source/tools/dist/0ad.nsi
===================================================================
--- source/tools/dist/0ad.nsi
+++ source/tools/dist/0ad.nsi
@@ -69,6 +69,10 @@
 
   !insertmacro MUI_PAGE_INSTFILES
 
+  !define MUI_FINISHPAGE_SHOWREADME ""
+  !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+  !define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
+  !define MUI_FINISHPAGE_SHOWREADME_FUNCTION finishpageaction
   !define MUI_FINISHPAGE_RUN $INSTDIR\binaries\system\pyrogenesis.exe
   !insertmacro MUI_PAGE_FINISH
   
@@ -194,6 +198,10 @@
 
 FunctionEnd
 
+Function finishpageaction
+CreateShortcut "$desktop\foo.lnk" "$instdir\foo.exe"
+FunctionEnd
+
 ;--------------------------------
 ;Descriptions
 
@@ -237,6 +245,7 @@
   Delete "$SMPROGRAMS\$StartMenuFolder\Map editor.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\0 A.D..lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\Web site.url"
+  Delete "$DESKTOP\0 A.D..lnk" "$INSTDIR\binaries\system\pyrogenesis.exe"
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 
   DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\0 A.D."