Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 14195)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 14196)
@@ -260,5 +260,5 @@
 ;
 SectionIn 1 2 RO
-SetShellVarContext all
+SetShellVarContext current
 
 SetOutPath $INSTDIR
@@ -319,5 +319,5 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext all
+SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
 File "..\dist\wmsplugin.jar"
@@ -336,5 +336,5 @@
 ;-------------------------------------------
 SectionIn 1 2
-SetShellVarContext all
+SetShellVarContext current
 SetOutPath $APPDATA\JOSM\plugins
 File "..\dist\validator.jar"
@@ -402,5 +402,5 @@
 ;
 SectionIn 1 2
-SetShellVarContext all
+SetShellVarContext current
 
 Delete "$INSTDIR\josm.exe"
@@ -418,9 +418,4 @@
 Delete "$INSTDIR\webkit-image.exe"
 Delete "$INSTDIR\uninstall.exe"
-Delete "$APPDATA\JOSM\plugins\wmsplugin.jar"
-Delete "$APPDATA\JOSM\plugins\namefinder.jar"
-Delete "$APPDATA\JOSM\plugins\validator.jar"
-RMDir "$APPDATA\JOSM\plugins"
-RMDir "$APPDATA\JOSM"
 
 DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\OSM"
@@ -455,19 +450,14 @@
 SectionIn 2
 SetShellVarContext current
+Delete "$APPDATA\JOSM\plugins\wmsplugin\*.*"
+RMDir "$APPDATA\JOSM\plugins\wmsplugin"
+Delete "$APPDATA\JOSM\plugins\validator\*.*"
+RMDir "$APPDATA\JOSM\plugins\validator"
+Delete "$APPDATA\JOSM\plugins\*.*"
+RMDir "$APPDATA\JOSM\plugins"
+
+Delete "$APPDATA\JOSM\motd.html"
 Delete "$APPDATA\JOSM\preferences"
 Delete "$APPDATA\JOSM\bookmarks"
-RMDir "$APPDATA\JOSM"
-SectionEnd
-
-Section /o "un.$(un.JOSM_SEC_PLUGINS)"un.SecPlugins
-;-------------------------------------------
-SectionIn 2
-SetShellVarContext current
-Delete "$APPDATA\JOSM\plugins\wmsplugin.jar"
-Delete "$APPDATA\JOSM\plugins\namefinder.jar"
-Delete "$APPDATA\JOSM\plugins\validator\*.*"
-Delete "$APPDATA\JOSM\plugins\validator.jar"
-RMDir "$APPDATA\JOSM\plugins\validator"
-RMDir "$APPDATA\JOSM\plugins"
 RMDir "$APPDATA\JOSM"
 SectionEnd
@@ -503,5 +493,4 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${un.SecUinstall} $(un.JOSM_SECDESC_UNINSTALL)
   !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPersonalSettings} $(un.JOSM_SECDESC_PERSONAL_SETTINGS)
-  !insertmacro MUI_DESCRIPTION_TEXT ${un.SecPlugins} $(un.JOSM_SECDESC_PLUGINS)
 !insertmacro MUI_UNFUNCTION_DESCRIPTION_END
 
Index: /applications/editors/josm/nsis/langmacros.nsh
===================================================================
--- /applications/editors/josm/nsis/langmacros.nsh	(revision 14195)
+++ /applications/editors/josm/nsis/langmacros.nsh	(revision 14196)
@@ -75,5 +75,4 @@
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_UNINSTALL			${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_PERSONAL_SETTINGS	${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT un.JOSM_SECDESC_PLUGINS				${CUR_LANG}
   
 
Index: /applications/editors/josm/nsis/locale/english.nsh
===================================================================
--- /applications/editors/josm/nsis/locale/english.nsh	(revision 14195)
+++ /applications/editors/josm/nsis/locale/english.nsh	(revision 14196)
@@ -54,5 +54,4 @@
 
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_UNINSTALL "Uninstall JOSM."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Uninstall personal settings like your preferences and bookmarks from your profile: $PROFILE."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PLUGINS  "Uninstall all plugins."
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Uninstall personal settings from your profile: $PROFILE."
 
Index: /applications/editors/josm/nsis/locale/german.nsh
===================================================================
--- /applications/editors/josm/nsis/locale/german.nsh	(revision 14195)
+++ /applications/editors/josm/nsis/locale/german.nsh	(revision 14196)
@@ -49,5 +49,3 @@
 
 !insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_UNINSTALL "Deinstalliere JOSM."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Deinstalliere persönliche Einstellungen wie die Preferences und Bookmarks von Ihrem Profil: $PROFILE."
-!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PLUGINS  "Deinstalliere alle Plugins."
-
+!insertmacro JOSM_MACRO_DEFAULT_STRING un.JOSM_SECDESC_PERSONAL_SETTINGS  "Deinstalliere persönliche Einstellungen von Ihrem Profil: $PROFILE."