diff --git a/src/de/schildbach/pte/AbstractHafasProvider.java b/src/de/schildbach/pte/AbstractHafasProvider.java
index 9fa9f3ee..f10ef789 100644
--- a/src/de/schildbach/pte/AbstractHafasProvider.java
+++ b/src/de/schildbach/pte/AbstractHafasProvider.java
@@ -583,7 +583,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 		throw new IllegalArgumentException(location.type.toString());
 	}
 
-	private static final Pattern P_LINE_S = Pattern.compile("SN?\\d+");
+	private static final Pattern P_LINE_S = Pattern.compile("S\\d+");
+	private static final Pattern P_LINE_SN = Pattern.compile("SN\\d*");
 
 	private final String _normalizeLine(final String type, final String name, final String longCategory)
 	{
@@ -648,6 +649,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
 			return "S" + normalizedName;
 		if (P_LINE_S.matcher(normalizedType).matches()) // diverse S-Bahnen
 			return "S" + normalizedType;
+		if (P_LINE_SN.matcher(normalizedType).matches()) // Nacht-S-Bahn
+			return "S" + normalizedType;
 
 		if ("Met".equals(normalizedType)) // Metro
 			return "U" + normalizedName;