--- a/enano-bundle.nsi	Fri Dec 18 19:16:05 2009 -0600
+++ b/enano-bundle.nsi	Fri Dec 18 20:36:15 2009 -0600
@@ -341,9 +341,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