Index: applications/nsis/openstreetmap-setup.sh
===================================================================
--- applications/nsis/openstreetmap-setup.sh	(revision 2949)
+++ applications/nsis/openstreetmap-setup.sh	(revision 2952)
@@ -3,5 +3,5 @@
 ## settings ##
 
-VERSION=0.0.6
+VERSION=0.0.7
 
 PROGRAM_FILES="/cygdrive/c/Program Files"
@@ -20,5 +20,11 @@
 
 # get latest plugin (and supporting files) versions
-wget -nc http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/mappaint.jar
+cp ../../editors/josm/plugins/mappaint/mappaint.jar .
+cp ../../editors/josm/plugins/namefinder/namefinder.jar .
+#cp ../../editors/josm/plugins/osmarender/osmarender.jar .
+#cp ../../editors/josm/plugins/annotation-tester/annotation-tester.jar .
+#cp ../../editors/josm/plugins/wmsplugin/wmsplugin.jar .
+
+# wget -nc http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/mappaint.jar
 # wget -nc http://www.free-map.org.uk/downloads/josm/mappaint.jar
 # wget -nc http://www.free-map.org.uk/downloads/josm/elemstyles.xml
Index: applications/nsis/openstreetmap.nsi
===================================================================
--- applications/nsis/openstreetmap.nsi	(revision 2949)
+++ applications/nsis/openstreetmap.nsi	(revision 2952)
@@ -389,4 +389,12 @@
 SectionEnd
 
+Section "namefinder" SecNamefinderPlugin
+;-------------------------------------------
+SectionIn 1 2
+SetShellVarContext current
+SetOutPath $APPDATA\JOSM\plugins
+File "downloads\namefinder.jar"
+SectionEnd
+
 SectionGroupEnd	; "Plugins"
 
@@ -395,5 +403,5 @@
 ;MessageBox MB_OK "PluginSetting!" IDOK 0
 SetShellVarContext current
-${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "mappaint,osmarender,wmsplugin"
+${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "mappaint,osmarender,wmsplugin,namefinder"
 SectionEnd
 
@@ -415,5 +423,5 @@
 NoJOSMErrorMsg:
 
-DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\JOSM"
+DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM"
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\josm.exe"
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\App Paths\josm.exe"
@@ -445,4 +453,5 @@
 Delete "$APPDATA\JOSM\preferences"
 Delete "$APPDATA\JOSM\bookmarks"
+Delete "$APPDATA\JOSM\de-streets.xml"
 RMDir "$APPDATA\JOSM"
 SectionEnd
@@ -456,4 +465,5 @@
 Delete "$APPDATA\JOSM\plugins\osmarender\*.*"
 Delete "$APPDATA\JOSM\plugins\mappaint.jar"
+Delete "$APPDATA\JOSM\plugins\namefinder.jar"
 ;Delete "$APPDATA\JOSM\plugins\mappaint\elemstyles.xml"
 RMDir "$APPDATA\JOSM\plugins\osmarender"
@@ -483,4 +493,5 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOsmarenderPlugin} "Displays the current screen as nicely rendered SVG graphics in FireFox."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecWMSPlugin} "Display background images from Web Map Service (WMS) sources."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecNamefinderPlugin} "Add a 'Find places by their name' tab to the download dialog."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END