diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index cadfea3d..9a93c129 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -1685,7 +1685,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 		return 0;
 	}
 
-	protected static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zßÄÅäáàâåéèêíìîÖöóòôÜüúùûØ/-]+)[\\s-]*(.*)");
+	protected static final Pattern P_NORMALIZE_LINE = Pattern.compile("([A-Za-zßÄÅäáàâåéèêíìîÖöóòôÜüúùûØ/]+)[\\s-]*(.*)");
 
 	protected String normalizeLine(final String type, final String line)
 	{
diff --git a/src/de/schildbach/pte/RmvProvider.java b/src/de/schildbach/pte/RmvProvider.java
index 047c2874..feca23c2 100644
--- a/src/de/schildbach/pte/RmvProvider.java
+++ b/src/de/schildbach/pte/RmvProvider.java
@@ -359,11 +359,13 @@ public class RmvProvider extends AbstractHafasProvider
 				return "B" + number;
 			if (type.equals("BN"))
 				return "BN" + number;
+			if ("BuFB".equals(type))
+				return "BBuFB" + number;
 			if (type.equals("N"))
 				return "BN" + number;
 			if (type.equals("AS")) // Anruf-Sammel-Taxi
 				return "BAS" + number;
-			if (type.equals("ASOF-")) // Anruf-Sammel-Taxi
+			if (type.equals("ASOF")) // Anruf-Sammel-Taxi
 				return "BASOF" + number;
 			if (type.startsWith("AST")) // Anruf-Sammel-Taxi
 				return "BAST" + type.substring(3) + number;