Index: /applications/editors/josm/nsis/josm.nsi
===================================================================
--- /applications/editors/josm/nsis/josm.nsi	(revision 24716)
+++ /applications/editors/josm/nsis/josm.nsi	(revision 24717)
@@ -315,12 +315,4 @@
 SectionEnd
 
-Section $(JOSM_SEC_REMOTECONTROL_PLUGIN) SecRemoteControlPlugin
-;-------------------------------------------
-SectionIn 1 2
-SetShellVarContext current
-SetOutPath $APPDATA\JOSM\plugins
-File "..\dist\remotecontrol.jar"
-SectionEnd
-
 Section $(JOSM_SEC_TURNRESTRICTIONS_PLUGIN) SecTurnrestrictionsPlugin
 ;-------------------------------------------
@@ -331,10 +323,8 @@
 SectionEnd
 
-Section $(JOSM_SEC_WMS_PLUGIN) SecWMSPlugin
-;-------------------------------------------
-SectionIn 1 2
-SetShellVarContext current
-SetOutPath $APPDATA\JOSM\plugins
-File "..\dist\wmsplugin.jar"
+Section $(JOSM_SEC_WMS) SecWMS
+;-------------------------------------------
+SectionIn 1 2
+SetShellVarContext current
 SetOutPath $INSTDIR\imageformats
 File "webkit-image\imageformats\qjpeg4.dll"
@@ -399,7 +389,5 @@
 !include LogicLib.nsh
 ${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "openstreetbugs
-remotecontrol
-turnrestrictions
-wmsplugin"
+turnrestrictions"
 SectionEnd
 
@@ -467,4 +455,6 @@
 Delete "$APPDATA\JOSM\plugins\remotecontrol\*.*"
 RMDir "$APPDATA\JOSM\plugins\remotecontrol"
+Delete "$APPDATA\JOSM\plugins\validator\*.*"
+RMDir "$APPDATA\JOSM\plugins\validator"
 Delete "$APPDATA\JOSM\plugins\wmsplugin\*.*"
 RMDir "$APPDATA\JOSM\plugins\wmsplugin"
@@ -496,7 +486,6 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPluginsGroup} $(JOSM_SECDESC_PLUGINS_GROUP)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecOpenStreetBugsPlugin} $(JOSM_SECDESC_OPENSTREETBUGS_PLUGIN)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecRemoteControlPlugin} $(JOSM_SECDESC_REMOTECONTROL_PLUGIN)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecTurnrestrictionsPlugin} $(JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecWMSPlugin} $(JOSM_SECDESC_WMS_PLUGIN)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecWMS} $(JOSM_SECDESC_WMS)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} $(JOSM_SECDESC_STARTMENU)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} $(JOSM_SECDESC_DESKTOP_ICON)
Index: /applications/editors/josm/nsis/langmacros.nsh
===================================================================
--- /applications/editors/josm/nsis/langmacros.nsh	(revision 24716)
+++ /applications/editors/josm/nsis/langmacros.nsh	(revision 24717)
@@ -37,10 +37,7 @@
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_JOSM 					${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_PLUGINS_GROUP 			${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_AGPIFOJ_PLUGIN	        ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_OPENSTREETBUGS_PLUGIN 	${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_REMOTECONTROL_PLUGIN 	${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_TURNRESTRICTIONS_PLUGIN    ${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_VALIDATOR_PLUGIN 		${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_WMS_PLUGIN 			${CUR_LANG}
+  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_WMS 			${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_STARTMENU 				${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SEC_DESKTOP_ICON 			${CUR_LANG}
@@ -50,10 +47,7 @@
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_JOSM				${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_PLUGINS_GROUP		${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_AGPIFOJ_PLUGIN	    ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_OPENSTREETBUGS_PLUGIN  ${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_REMOTECONTROL_PLUGIN   ${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_TURNRESTRICTIONS_PLUGIN	${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_VALIDATOR_PLUGIN	${CUR_LANG}
-  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_WMS_PLUGIN			${CUR_LANG}
+  !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_WMS			${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_STARTMENU			${CUR_LANG}
   !insertmacro JOSM_MACRO_LANGSTRING_INSERT JOSM_SECDESC_DESKTOP_ICON		${CUR_LANG}
Index: /applications/editors/josm/nsis/locale/english.nsh
===================================================================
--- /applications/editors/josm/nsis/locale/english.nsh	(revision 24716)
+++ /applications/editors/josm/nsis/locale/english.nsh	(revision 24717)
@@ -20,8 +20,6 @@
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_AGPIFOJ_PLUGIN  "AgPifoJ"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_OPENSTREETBUGS_PLUGIN  "OpenStreetBugs"
-!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_REMOTECONTROL_PLUGIN  "RemoteControl"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_TURNRESTRICTIONS_PLUGIN  "TurnRestrictions"
-!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_VALIDATOR_PLUGIN  "Validator"
-!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_WMS_PLUGIN  "WMS"
+!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_WMS  "WMS"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_STARTMENU  "Start Menu Entry"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_DESKTOP_ICON  "Desktop Icon"
Index: /applications/editors/josm/nsis/locale/german.nsh
===================================================================
--- /applications/editors/josm/nsis/locale/german.nsh	(revision 24716)
+++ /applications/editors/josm/nsis/locale/german.nsh	(revision 24717)
@@ -17,8 +17,6 @@
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_AGPIFOJ_PLUGIN  "AgPifoJ"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_OPENSTREETBUGS_PLUGIN  "OpenStreetBugs"
-!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_REMOTECONTROL_PLUGIN  "RemoteControl"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_TURNRESTRICTIONS_PLUGIN  "TurnRestrictions"
-!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_VALIDATOR_PLUGIN  "Validator"
-!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_WMS_PLUGIN  "WMS"
+!insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_WMS  "WMS"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_STARTMENU  "Startmenü Eintrag"
 !insertmacro JOSM_MACRO_DEFAULT_STRING JOSM_SEC_DESKTOP_ICON  "Desktop Icon"