--- a/enano-bundle.nsi	Sat Aug 21 18:19:58 2010 -0400
+++ b/enano-bundle.nsi	Sat Aug 21 18:20:18 2010 -0400
@@ -336,9 +336,18 @@
   
   DetailPrint "Deleting files..."
   SetDetailsPrint listonly
+  
+; Remove shortcut stored in $INSTDIR
+  Delete "$INSTDIR\${PRODUCT_NAME}.url"
+  
   !insertmacro Core_Uninstall
   SetDetailsPrint both
 
+  ; Remove shortcuts in Start Menu
+  Delete "$SMPROGRAMS\Enano CMS\Website.lnk" 
+  Delete "$SMPROGRAMS\Enano CMS\Uninstall.lnk"
+  RMDir "$SMPROGRAMS\Enano CMS"
+
   DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
   SetAutoClose true
 SectionEnd