Index: /applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java
===================================================================
--- /applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java	(revision 31715)
+++ /applications/editors/josm/plugins/seachart/josmtos57/src/josmtos57/Josmtos57.java	(revision 31716)
@@ -20,4 +20,11 @@
 public class Josmtos57 {
 
+	// http://opendatacommons.org/licenses/odbl/1-0/
+	
+	/*
+	URL website = new URL("http://www.website.com/information.asp");
+	try (InputStream in = website.openStream()) { Files.copy(in, target, StandardCopyOption.REPLACE_EXISTING); }
+	 */
+	
 	static byte[] header = {
 		'0', '0', '2', '6', '2', '3', 'L', 'E', '1', ' ', '0', '9', '0', '0', '0', '7', '3', ' ', ' ', ' ', '6', '6', '0', '4', '0', '0', '0', '0', '0', '0', '0', '0',
@@ -94,5 +101,5 @@
 		crc.update(buf, 0, idx);
 		try {
-			File file = new File(args[2] + "/" + args[3]);
+			File file = new File(args[2] + args[3]);
 			if (file.exists()) file.delete();
 			out = new FileOutputStream(file, false);
@@ -105,5 +112,5 @@
 		
 		try {
-			File file = new File(args[2] + "/CATALOG.031");
+			File file = new File(args[2] + "CATALOG.031");
 			if (file.exists()) file.delete();
 			out = new FileOutputStream(file, false);
Index: /applications/editors/josm/plugins/seachart/src/render/Rules.java
===================================================================
--- /applications/editors/josm/plugins/seachart/src/render/Rules.java	(revision 31715)
+++ /applications/editors/josm/plugins/seachart/src/render/Rules.java	(revision 31716)
@@ -190,5 +190,4 @@
 			if (testObject(Obj.LKBSPT)) for (Feature f : objects) if (testFeature(f)) areas();
 			if (testObject(Obj.LAKARE)) for (Feature f : objects) if (testFeature(f)) areas();
-			if (testObject(Obj.RIVBNK)) for (Feature f : objects) if (testFeature(f)) areas();
 			if (testObject(Obj.RIVERS)) for (Feature f : objects) if (testFeature(f)) waterways();
 			if (testObject(Obj.CANALS)) for (Feature f : objects) if (testFeature(f)) waterways();
@@ -286,5 +285,4 @@
 			break;
 		case LAKARE:
-		case RIVBNK:
 			Renderer.lineVector(feature, new LineStyle(Symbols.Bwater, 10, Symbols.Bwater));
 			break;
Index: /applications/editors/josm/plugins/seachart/src/s57/S57osm.java
===================================================================
--- /applications/editors/josm/plugins/seachart/src/s57/S57osm.java	(revision 31715)
+++ /applications/editors/josm/plugins/seachart/src/s57/S57osm.java	(revision 31716)
@@ -37,5 +37,5 @@
 	static {
 		OSMtags.put("natural=coastline", new KeyVal<>(Obj.COALNE, Att.UNKATT, null, null)); OSMtags.put("natural=water", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null));
-		OSMtags.put("waterway=river", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null));
+		OSMtags.put("waterway=river", new KeyVal<>(Obj.RIVERS, Att.UNKATT, null, null)); OSMtags.put("waterway=riverbank", new KeyVal<>(Obj.COALNE, Att.UNKATT, null, null));
 		OSMtags.put("waterway=canal", new KeyVal<>(Obj.CANALS, Att.UNKATT, null, null)); OSMtags.put("waterway=dock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null));
 		OSMtags.put("waterway=lock", new KeyVal<>(Obj.HRBBSN, Att.UNKATT, null, null)); OSMtags.put("landuse=basin", new KeyVal<>(Obj.LAKARE, Att.UNKATT, null, null));