diff --git a/src/de/schildbach/pte/BahnProvider.java b/src/de/schildbach/pte/BahnProvider.java
index 42c3ef52..045a4ea8 100644
--- a/src/de/schildbach/pte/BahnProvider.java
+++ b/src/de/schildbach/pte/BahnProvider.java
@@ -737,7 +737,7 @@ public final class BahnProvider implements NetworkProvider
 				return "RLEO" + number;
 			if (type.equals("VEN")) // Rhenus Veniro
 				return "RVEN" + number;
-			if (type.equals("KD")) // Koleje Dolnośląskie
+			if (type.equals("KD")) // Koleje Dolnośląskie (Niederschlesische Eisenbahn)
 				return "RKD" + number;
 			if (type.equals("SKW")) // Polen
 				return "RSKW" + number;
@@ -747,8 +747,6 @@ public final class BahnProvider implements NetworkProvider
 				return "RPCC" + number;
 			if (type.equals("SKM")) // Polen
 				return "RSKM" + number;
-			if (type.equals("WKD")) // Warszawska Kolej Dojazdowa, Polen
-				return "RWKD" + number;
 			if (type.equals("LYN")) // Dänemark
 				return "RLYN" + number;
 			if (type.equals("EX")) // Norwegen
@@ -778,6 +776,8 @@ public final class BahnProvider implements NetworkProvider
 				return "SCAT" + number;
 			if (type.equals("DPN")) // S3 Bad Reichenhall-Freilassing
 				return "SDPN" + number;
+			if (type.equals("WKD")) // Warszawska Kolej Dojazdowa (Warsaw Suburban Railway)
+				return "SWKD" + number;
 
 			if (type.equals("U"))
 				return "UU" + number;
diff --git a/src/de/schildbach/pte/OebbProvider.java b/src/de/schildbach/pte/OebbProvider.java
index b633d95f..805544ea 100644
--- a/src/de/schildbach/pte/OebbProvider.java
+++ b/src/de/schildbach/pte/OebbProvider.java
@@ -648,8 +648,6 @@ public class OebbProvider extends AbstractHafasProvider
 			return 'R';
 		if (ucType.equals("SKW")) // Polen
 			return 'R';
-		if (ucType.equals("WKD")) // Warszawska Kolej Dojazdowa, Polen
-			return 'R';
 		if (ucType.equals("EX")) // Polen
 			return 'R';
 		if (ucType.equals("NEB")) // Kostrzyn-Berlin, via JSON API
@@ -769,6 +767,8 @@ public class OebbProvider extends AbstractHafasProvider
 			return 'S';
 		if (ucType.equals("RER")) // Réseau Express Régional, Frankreich
 			return 'S';
+		if (ucType.equals("WKD")) // Warszawska Kolej Dojazdowa (Warsaw Suburban Railway)
+			return 'S';
 
 		if (ucType.equals("LKB")) // Connections only?
 			return 'T';