Index: applications/editors/josm/nsis/josm-setup.sh
===================================================================
--- applications/editors/josm/nsis/josm-setup.sh	(revision 4909)
+++ applications/editors/josm/nsis/josm-setup.sh	(revision 4943)
@@ -15,11 +15,11 @@
 
 # get latest josm version (and license)
-wget -N http://josm.eigenheimstrasse.de/download/josm-latest.jar
-wget -N http://josm.eigenheimstrasse.de/browser/LICENSE?format=raw
+wget -N http://josm.openstreetmap.de/download/josm-latest.jar
+wget -N http://josm.openstreetmap.de/browser/trunk/LICENSE?format=raw
 cp LICENSE?format=raw LICENSE
 
 # get latest plugin (and supporting files) versions
 #cp ../../plugins/annotation-tester/annotation-tester.jar .
-wget -N http://www.eigenheimstrasse.de/josm/plugins/annotation-tester.jar
+#wget -N http://josm.openstreetmap.de/download/plugins/tagging-preset-tester.jar
 cp ../../plugins/mappaint/mappaint.jar .
 # wget -N http://svn.openstreetmap.org/applications/editors/josm/plugins/mappaint/mappaint.jar
@@ -27,7 +27,5 @@
 # wget --N http://svn.openstreetmap.org/applications/editors/josm/plugins/namefinder/namefinder.jar
 #cp ../../plugins/osmarender/osmarender.jar .
-wget -N http://www.eigenheimstrasse.de/josm/plugins/osmarender.jar
-#cp ../../plugins/tways/tways-0.2.jar .
-wget -N http://thomas.walraet.net/tways/tways-0.2.jar
+wget -N http://josm.openstreetmap.de/download/plugins/osmarender.jar
 #cp ../../plugins/validator/validator.jar .
 wget -N http://personales.ya.com/osmfrsantos/validator/latest/validator.jar
Index: applications/editors/josm/nsis/josm.nsi
===================================================================
--- applications/editors/josm/nsis/josm.nsi	(revision 4909)
+++ applications/editors/josm/nsis/josm.nsi	(revision 4943)
@@ -356,12 +356,4 @@
 SetOutPath $APPDATA\JOSM\plugins
 File "downloads\validator.jar"
-SectionEnd
-
-Section "tways" SecTWaysPlugin
-;-------------------------------------------
-SectionIn 1 2
-SetShellVarContext all
-SetOutPath $APPDATA\JOSM\plugins
-File "downloads\tways-0.2.jar"
 SectionEnd
 
@@ -441,5 +433,6 @@
 ; XXX - should better be handled inside JOSM (recent plugin manager is going in the right direction)
 SetShellVarContext current
-${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "mappaint,osmarender,wmsplugin,namefinder,validator,tways-0.2"
+;${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "mappaint,osmarender,wmsplugin,namefinder,validator"
+${WriteINIStrNS} $R0 "$APPDATA\JOSM\preferences" "plugins" "mappaint,osmarender,wmsplugin,namefinder"
 SectionEnd
 
@@ -461,5 +454,4 @@
 Delete "$INSTDIR\plugins\namefinder.jar"
 Delete "$INSTDIR\plugins\validator.jar"
-Delete "$INSTDIR\plugins\tways-0.2.jar"
 IfErrors 0 NoJOSMErrorMsg
 	MessageBox MB_OK "Please note: josm.exe could not be removed, it's probably in use!" IDOK 0 ;skipped if josm.exe removed
@@ -513,5 +505,4 @@
 Delete "$APPDATA\JOSM\plugins\validator\*.*"
 Delete "$APPDATA\JOSM\plugins\validator.jar"
-Delete "$APPDATA\JOSM\plugins\tways-0.2.jar"
 RMDir "$APPDATA\JOSM\plugins\osmarender"
 RMDir "$APPDATA\JOSM\plugins\validator"
@@ -542,5 +533,4 @@
   !insertmacro MUI_DESCRIPTION_TEXT ${SecNamefinderPlugin} "Add a 'Find places by their name' tab to the download dialog."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecValidatorPlugin} "Validates edited data if it conforms to common suggestions."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTwaysPlugin} "Mass wayfication of segments."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenu} "Add a JOSM start menu entry."
   !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopIcon} "Add a JOSM desktop icon."