diff --git a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
index 51ad3422..d12813b9 100644
--- a/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -733,6 +733,8 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				return 'I' + str;
 			if (type.equals("RJ")) // railjet
 				return 'I' + str;
+			if ("WB".equals(type)) // westbahn
+				return 'R' + str;
 			if (type.equals("OEC")) // ÖBB-EuroCity
 				return 'I' + str;
 			if (type.equals("OIC")) // ÖBB-InterCity
@@ -980,8 +982,6 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
 				return 'R' + str;
 			if (type.equals("VIAMO"))
 				return 'R' + str;
-			if ("WB".equals(type)) // WESTbahn
-				return 'R' + str;
 			if (type.equals("SE")) // Southeastern, GB
 				return 'R' + str;
 			if (type.equals("SW")) // South West Trains, GB
diff --git a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
index 06955ec4..a2f951ba 100644
--- a/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/enabler/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -2251,6 +2251,8 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return 'I';
 		if ("RJ".equals(ucType)) // RailJet, Österreichische Bundesbahnen
 			return 'I';
+		if ("WB".equals(ucType)) // westbahn
+			return 'I';
 		if ("THA".equals(ucType)) // Thalys
 			return 'I';
 		if ("TGV".equals(ucType)) // Train à Grande Vitesse
@@ -2493,8 +2495,6 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
 			return 'R';
 		if ("ZR".equals(ucType)) // ZSR (Slovakian Republic Railways)
 			return 'R';
-		if ("WB".equals(ucType)) // WESTbahn
-			return 'R';
 		if ("RNV".equals(ucType)) // Rhein-Neckar-Verkehr GmbH
 			return 'R';
 		if ("DWE".equals(ucType)) // Dessau-Wörlitzer Eisenbahn
diff --git a/enabler/src/de/schildbach/pte/OebbProvider.java b/enabler/src/de/schildbach/pte/OebbProvider.java
index aa76019e..fe77a926 100644
--- a/enabler/src/de/schildbach/pte/OebbProvider.java
+++ b/enabler/src/de/schildbach/pte/OebbProvider.java
@@ -40,7 +40,7 @@ public class OebbProvider extends AbstractHafasProvider
 
 	public OebbProvider()
 	{
-		super(API_BASE + "query.exe/dn", 12, null);
+		super(API_BASE + "query.exe/dn", 13, null);
 	}
 
 	public NetworkId id()
@@ -85,6 +85,8 @@ public class OebbProvider extends AbstractHafasProvider
 			return 'I';
 		if (value == 2048)
 			return 'P';
+		if (value == 4096)
+			return 'I';
 
 		throw new IllegalArgumentException("cannot handle: " + value);
 	}
@@ -98,6 +100,7 @@ public class OebbProvider extends AbstractHafasProvider
 			productBits.setCharAt(1, '1'); // ÖBB EC/ÖBB IC
 			productBits.setCharAt(2, '1'); // EC/IC
 			productBits.setCharAt(10, '1'); // Autoreisezug
+			productBits.setCharAt(12, '1'); // westbahn
 		}
 		else if (product == 'R')
 		{