diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java
index c4977bec..e9fd141e 100644
--- a/enabler/src/de/schildbach/pte/NetworkId.java
+++ b/enabler/src/de/schildbach/pte/NetworkId.java
@@ -28,7 +28,7 @@ public enum NetworkId {
     DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, HVV, SH, GVH, BSVAG, VBN, NASA, VVO, VMS, VGS, VRR, VRS, MVG, NPH, VRN, VVS, DING, KVV, VAGFR, NVBW, VVV,
 
     // Austria
-    OEBB, VAO, VOR, WIEN, OOEVV, LINZ, VVT, IVB, STV, VMOBIL,
+    OEBB, VAO, VOR, WIEN, OOEVV, LINZ, SVV, VVT, IVB, STV, VMOBIL,
 
     // Switzerland
     SBB, BVB, VBL, ZVV,
diff --git a/enabler/src/de/schildbach/pte/SvvProvider.java b/enabler/src/de/schildbach/pte/SvvProvider.java
new file mode 100644
index 00000000..0f951d7a
--- /dev/null
+++ b/enabler/src/de/schildbach/pte/SvvProvider.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2010-2015 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.io.IOException;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
+import com.google.common.base.Charsets;
+
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.NearbyLocationsResult;
+import de.schildbach.pte.dto.Product;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.QueryTripsContext;
+import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.Style;
+import de.schildbach.pte.dto.SuggestLocationsResult;
+
+/**
+ * @author Andreas Schildbach
+ */
+public class SvvProvider extends AbstractHafasProvider {
+    private static final String API_BASE = "https://fahrplan.salzburg-verkehr.at/bin/";
+    private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.SUBURBAN_TRAIN, Product.SUBWAY,
+            null, Product.TRAM, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS, Product.TRAM, Product.FERRY,
+            Product.ON_DEMAND, Product.BUS, Product.REGIONAL_TRAIN, null, null, null };
+
+    public SvvProvider(final String jsonApiAuthorization) {
+        super(NetworkId.SVV, API_BASE, "dn", PRODUCTS_MAP);
+
+        setJsonApiVersion("1.11");
+        setJsonApiClient("{\"id\":\"VAO\",\"l\":\"vs_svv\",\"type\":\"AND\"}");
+        setJsonApiAuthorization(jsonApiAuthorization);
+        setJsonNearbyLocationsEncoding(Charsets.UTF_8);
+        setStyles(STYLES);
+    }
+
+    @Override
+    public Set<Product> defaultProducts() {
+        return Product.ALL;
+    }
+
+    private static final Pattern P_SPLIT_NAME_ONE_COMMA = Pattern.compile("([^,]*), ([^,]{3,64})");
+
+    @Override
+    protected String[] splitStationName(final String name) {
+        final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
+        if (m.matches())
+            return new String[] { m.group(2), m.group(1) };
+
+        return super.splitStationName(name);
+    }
+
+    @Override
+    protected String[] splitPOI(final String poi) {
+        final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
+        if (m.matches())
+            return new String[] { m.group(2), m.group(1) };
+
+        return super.splitPOI(poi);
+    }
+
+    @Override
+    protected String[] splitAddress(final String address) {
+        final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
+        if (m.matches())
+            return new String[] { m.group(1), m.group(2) };
+
+        return super.splitAddress(address);
+    }
+
+    @Override
+    public NearbyLocationsResult queryNearbyLocations(final EnumSet<LocationType> types, final Location location,
+            final int maxDistance, final int maxLocations) throws IOException {
+        if (location.hasLocation())
+            return jsonLocGeoPos(types, location.lat, location.lon);
+        else
+            throw new IllegalArgumentException("cannot handle: " + location);
+    }
+
+    @Override
+    public QueryDeparturesResult queryDepartures(final String stationId, final @Nullable Date time,
+            final int maxDepartures, final boolean equivs) throws IOException {
+        return jsonStationBoard(stationId, time, maxDepartures, equivs);
+    }
+
+    @Override
+    public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException {
+        return jsonLocMatch(constraint);
+    }
+
+    @Override
+    public QueryTripsResult queryTrips(final Location from, final @Nullable Location via, final Location to,
+            final Date date, final boolean dep, final @Nullable Set<Product> products,
+            final @Nullable Optimize optimize, final @Nullable WalkSpeed walkSpeed,
+            final @Nullable Accessibility accessibility, final @Nullable Set<Option> options) throws IOException {
+        return jsonTripSearch(from, via, to, date, dep, products, null);
+    }
+
+    @Override
+    public QueryTripsResult queryMoreTrips(final QueryTripsContext context, final boolean later) throws IOException {
+        final JsonContext jsonContext = (JsonContext) context;
+        return jsonTripSearch(jsonContext.from, jsonContext.via, jsonContext.to, jsonContext.date, jsonContext.dep,
+                jsonContext.products, later ? jsonContext.laterContext : jsonContext.earlierContext);
+    }
+
+    private static final Map<String, Style> STYLES = new HashMap<String, Style>();
+
+    static {
+        STYLES.put("svv|SS1", new Style(Style.parseColor("#b61d33"), Style.WHITE));
+        STYLES.put("svv|SS2", new Style(Style.parseColor("#0069b4"), Style.WHITE));
+        STYLES.put("svv|SS3", new Style(Style.parseColor("#0aa537"), Style.WHITE));
+        STYLES.put("svv|SS4", new Style(Style.parseColor("#a862a4"), Style.WHITE));
+        STYLES.put("svv|SS11", new Style(Style.parseColor("#b61d33"), Style.WHITE));
+
+        STYLES.put("svv|B1", new Style(Style.parseColor("#e3000f"), Style.WHITE));
+        STYLES.put("svv|B2", new Style(Style.parseColor("#0069b4"), Style.WHITE));
+        STYLES.put("svv|B3", new Style(Style.parseColor("#956b27"), Style.WHITE));
+        STYLES.put("svv|B4", new Style(Style.parseColor("#ffcc00"), Style.WHITE));
+        STYLES.put("svv|B5", new Style(Style.parseColor("#04bbee"), Style.WHITE));
+        STYLES.put("svv|B6", new Style(Style.parseColor("#85bc22"), Style.WHITE));
+        STYLES.put("svv|B7", new Style(Style.parseColor("#009a9b"), Style.WHITE));
+        STYLES.put("svv|B8", new Style(Style.parseColor("#f39100"), Style.WHITE));
+        STYLES.put("svv|B10", new Style(Style.parseColor("#f8baa2"), Style.BLACK));
+        STYLES.put("svv|B12", new Style(Style.parseColor("#b9dfde"), Style.WHITE));
+        STYLES.put("svv|B14", new Style(Style.parseColor("#cfe09a"), Style.WHITE));
+    }
+}
diff --git a/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
new file mode 100644
index 00000000..898726e1
--- /dev/null
+++ b/enabler/test/de/schildbach/pte/live/SvvProviderLiveTest.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2010-2015 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.live;
+
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Date;
+
+import org.junit.Test;
+
+import de.schildbach.pte.NetworkProvider.Accessibility;
+import de.schildbach.pte.NetworkProvider.WalkSpeed;
+import de.schildbach.pte.SvvProvider;
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.NearbyLocationsResult;
+import de.schildbach.pte.dto.Product;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
+
+/**
+ * @author Andreas Schildbach
+ */
+public class SvvProviderLiveTest extends AbstractProviderLiveTest {
+    public SvvProviderLiveTest() {
+        super(new SvvProvider(secretProperty("svv.json_api_authorization")));
+    }
+
+    @Test
+    public void nearbyStations() throws Exception {
+        final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "455000200"));
+        print(result);
+    }
+
+    @Test
+    public void nearbyStationsByCoordinate() throws Exception {
+        final NearbyLocationsResult result = queryNearbyStations(Location.coord(47813093, 13045065));
+        print(result);
+    }
+
+    @Test
+    public void queryDepartures() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("455000200", false);
+        print(result);
+    }
+
+    @Test
+    public void queryDeparturesInvalidStation() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("999999", 0, false);
+        assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
+    }
+
+    @Test
+    public void suggestLocations() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Salzburg Hauptbahnhof");
+        print(result);
+        assertThat(result.getLocations(), hasItem(new Location(LocationType.STATION, "455000200")));
+    }
+
+    @Test
+    public void suggestLocationsIncomplete() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Kur");
+        print(result);
+    }
+
+    @Test
+    public void suggestLocationsWithUmlaut() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Südstadt");
+        print(result);
+        assertThat(result.getLocations(), hasItem(new Location(LocationType.STATION, "900015650")));
+    }
+
+    @Test
+    public void suggestLocationsAddress() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Kaigasse 10");
+        print(result);
+    }
+
+    @Test
+    public void suggestLocationsCoverage() throws Exception {
+        final SuggestLocationsResult salzburgResult = suggestLocations("Salzburg Hauptbahnhof");
+        print(salzburgResult);
+        assertThat(salzburgResult.getLocations(), hasItem(new Location(LocationType.STATION, "455000200")));
+    }
+
+    @Test
+    public void shortTrip() throws Exception {
+        final QueryTripsResult result = queryTrips(
+                new Location(LocationType.STATION, "455002100", 47797110, 13053632, "Salzburg", "Justizgebäude"), null,
+                new Location(LocationType.STATION, "455002200", 47794000, 13059223, "Salzburg", "Akademiestraße"),
+                new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL);
+        print(result);
+        assertEquals(QueryTripsResult.Status.OK, result.status);
+        assertTrue(result.trips.size() > 0);
+
+        if (!result.context.canQueryLater())
+            return;
+
+        final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
+        print(laterResult);
+
+        if (!laterResult.context.canQueryLater())
+            return;
+
+        final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true);
+        print(later2Result);
+
+        if (!later2Result.context.canQueryEarlier())
+            return;
+
+        final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
+        print(earlierResult);
+    }
+}