diff --git a/src/de/schildbach/pte/AbstractEfaProvider.java b/src/de/schildbach/pte/AbstractEfaProvider.java
index a2dd81c5..751d809c 100644
--- a/src/de/schildbach/pte/AbstractEfaProvider.java
+++ b/src/de/schildbach/pte/AbstractEfaProvider.java
@@ -315,6 +315,10 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 				return 'I' + str;
 			if (type.equals("RJ")) // railjet
 				return 'I' + str;
+			if (type.equals("OEC")) // ÖBB-EuroCity
+				return 'I' + str;
+			if (type.equals("OIC")) // ÖBB-InterCity
+				return 'I' + str;
 
 			if (type.equals("IR")) // Interregio
 				return 'R' + str;
@@ -326,6 +330,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 				return 'R' + str;
 			if (type.equals("R-Bahn")) // Regional-Express, VRR
 				return 'R' + str;
+			if (type.equals("REX")) // RegionalExpress, Österreich
+				return 'R' + str;
 			if (P_LINE_RE.matcher(type).matches())
 				return 'R' + str;
 			if (type.equals("RB")) // Regionalbahn
@@ -338,6 +344,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 				return 'R' + str;
 			if (type.equals("D")) // Schnellzug
 				return 'R' + str;
+			if (type.equals("S")) // ~Innsbruck
+				return 'R' + str;
 			if (type.equals("WFB")) // Westfalenbahn
 				return 'R' + str;
 			if (type.equals("NWB")) // NordWestBahn
@@ -517,7 +525,7 @@ public abstract class AbstractEfaProvider implements NetworkProvider
 			return 'C' + name;
 		if (t == 9)
 			return 'F' + name;
-		if (t == 11)
+		if (t == 11 || t == -1)
 			return '?' + name;
 
 		throw new IllegalStateException("cannot normalize mot '" + mot + "' name '" + name + "' long '" + longName + "'");
diff --git a/src/de/schildbach/pte/SvvProvider.java b/src/de/schildbach/pte/SvvProvider.java
new file mode 100644
index 00000000..3209f6fd
--- /dev/null
+++ b/src/de/schildbach/pte/SvvProvider.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2010 the original author or authors.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.schildbach.pte;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.util.ParserUtils;
+
+/**
+ * @author Andreas Schildbach
+ */
+public class SvvProvider extends AbstractEfaProvider
+{
+	public static final String NETWORK_ID = "efa.svv-info.at";
+	private final static String API_BASE = "http://efa.svv-info.at/svv/";
+
+	public boolean hasCapabilities(Capability... capabilities)
+	{
+		for (final Capability capability : capabilities)
+			if (capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS)
+				return true;
+
+		return false;
+	}
+
+	private static final String AUTOCOMPLETE_URI = API_BASE
+			+ "XSLT_TRIP_REQUEST2?outputFormat=XML&coordOutputFormat=WGS84&type_origin=any&name_origin=%s";
+
+	@Override
+	protected String autocompleteUri(final CharSequence constraint)
+	{
+		return String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), "ISO-8859-1"));
+	}
+
+	@Override
+	protected String nearbyLatLonUri(final int lat, final int lon)
+	{
+		return null;
+	}
+
+	private static final String NEARBY_STATION_URI = API_BASE
+			+ "XSLT_DM_REQUEST"
+			+ "?outputFormat=XML&coordOutputFormat=WGS84&name_dm=%s&type_dm=stop&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct";
+
+	@Override
+	protected String nearbyStationUri(final String stationId)
+	{
+		return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
+	}
+
+	public String departuresQueryUri(final String stationId, final int maxDepartures)
+	{
+		final StringBuilder uri = new StringBuilder();
+		uri.append(API_BASE).append("XSLT_DM_REQUEST");
+		uri.append("?outputFormat=XML");
+		uri.append("&coordOutputFormat=WGS84");
+		uri.append("&type_dm=stop");
+		uri.append("&name_dm=").append(stationId);
+		uri.append("&mode=direct");
+		return uri.toString();
+	}
+
+	@Override
+	protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
+			final String products, final WalkSpeed walkSpeed)
+	{
+		final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
+		final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm");
+
+		final StringBuilder uri = new StringBuilder();
+		uri.append(API_BASE);
+		uri.append("XSLT_TRIP_REQUEST2");
+
+		uri.append("?language=de");
+		appendCommonConnectionParams(uri);
+
+		appendLocation(uri, from, "origin");
+		appendLocation(uri, to, "destination");
+		if (via != null)
+			appendLocation(uri, via, "via");
+
+		uri.append("&itdDate=").append(ParserUtils.urlEncode(DATE_FORMAT.format(date)));
+		uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date)));
+		uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");
+
+		uri.append("&ptOptionsActive=1");
+		uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed));
+		uri.append(productParams(products));
+
+		return uri.toString();
+	}
+
+	@Override
+	protected String commandLink(final String sessionId, final String command)
+	{
+		final StringBuilder uri = new StringBuilder();
+		uri.append(API_BASE);
+		uri.append("XSLT_TRIP_REQUEST2");
+		uri.append("?sessionID=").append(sessionId);
+		appendCommonConnectionParams(uri);
+		uri.append("&command=").append(command);
+		return uri.toString();
+	}
+}