diff --git a/enabler/src/de/schildbach/pte/AvvAugsburgProvider.java b/enabler/src/de/schildbach/pte/AvvAugsburgProvider.java
new file mode 100644
index 00000000..362cd635
--- /dev/null
+++ b/enabler/src/de/schildbach/pte/AvvAugsburgProvider.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 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 <https://www.gnu.org/licenses/>.
+ */
+
+package de.schildbach.pte;
+
+import de.schildbach.pte.dto.Product;
+
+import okhttp3.HttpUrl;
+
+/**
+ * Provider implementation for the Augsburger Verkehrsverbund (Augsburg, Germany).
+ * 
+ * @author Andreas Schildbach
+ */
+public class AvvAugsburgProvider extends AbstractHafasClientInterfaceProvider {
+    private static final HttpUrl API_BASE = HttpUrl.parse("https://avv-augsburg.hafas.de/bin/");
+    private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN,
+            Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.FERRY,
+            Product.SUBWAY, Product.TRAM, Product.ON_DEMAND };
+
+    public AvvAugsburgProvider(final String jsonApiAuthorization) {
+        super(NetworkId.AVV_AUGSBURG, API_BASE, PRODUCTS_MAP);
+        setApiVersion("1.18");
+        setApiExt("DB.R16.12.a");
+        setApiClient("{\"id\":\"DB-REGIO-AVV\",\"v\":\"100\",\"type\":\"AND\",\"name\":\"RegioNavigator\"}");
+        setApiAuthorization(jsonApiAuthorization);
+    }
+
+    private static final String[] PLACES = { "Augsburg (Bayern)", "Augsburg" };
+
+    @Override
+    protected String[] splitStationName(final String name) {
+        for (final String place : PLACES) {
+            if (name.startsWith(place + " ") || name.startsWith(place + "-"))
+                return new String[] { place, name.substring(place.length() + 1) };
+            if (name.endsWith(", " + place))
+                return new String[] { place, name.substring(0, name.length() - place.length() - 2) };
+        }
+        return super.splitStationName(name);
+    }
+
+    @Override
+    protected String[] splitPOI(final String poi) {
+        for (final String place : PLACES) {
+            if (poi.startsWith(place + ", "))
+                return new String[] { place, poi.substring(place.length() + 2) };
+        }
+        return super.splitPOI(poi);
+    }
+
+    @Override
+    protected String[] splitAddress(final String address) {
+        for (final String place : PLACES) {
+            if (address.startsWith(place + ", "))
+                return new String[] { place, address.substring(place.length() + 2) };
+        }
+        return super.splitAddress(address);
+    }
+}
diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java
index 738249b7..c9091f18 100644
--- a/enabler/src/de/schildbach/pte/NetworkId.java
+++ b/enabler/src/de/schildbach/pte/NetworkId.java
@@ -25,7 +25,7 @@ public enum NetworkId {
     RT,
 
     // Germany
-    DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, VGN, VVM, VMV, SH, GVH, BSVAG, VBN, NASA, VMT, VVO, VMS, VGS, VRR, VRS, AVV_AACHEN, MVG, VRN, VVS, DING, KVV, NVBW, VVV,
+    DB, BVG, VBB, NVV, BAYERN, MVV, INVG, AVV, AVV_AUGSBURG, VGN, VVM, VMV, SH, GVH, BSVAG, VBN, NASA, VMT, VVO, VMS, VGS, VRR, VRS, AVV_AACHEN, MVG, VRN, VVS, DING, KVV, NVBW, VVV,
 
     // Austria
     OEBB, VAO, VOR, WIEN, OOEVV, LINZ, SVV, VVT, STV, VMOBIL,
diff --git a/enabler/test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java
new file mode 100644
index 00000000..9a3ad202
--- /dev/null
+++ b/enabler/test/de/schildbach/pte/live/AvvAugsburgProviderLiveTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 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 <https://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.AvvAugsburgProvider;
+import de.schildbach.pte.dto.Location;
+import de.schildbach.pte.dto.LocationType;
+import de.schildbach.pte.dto.NearbyLocationsResult;
+import de.schildbach.pte.dto.Point;
+import de.schildbach.pte.dto.QueryDeparturesResult;
+import de.schildbach.pte.dto.QueryTripsResult;
+import de.schildbach.pte.dto.SuggestLocationsResult;
+
+/**
+ * @author Andreas Schildbach
+ */
+public class AvvAugsburgProviderLiveTest extends AbstractProviderLiveTest {
+    public AvvAugsburgProviderLiveTest() {
+        super(new AvvAugsburgProvider(secretProperty("avv_augsburg.api_authorization")));
+    }
+
+    @Test
+    public void nearbyStationsByCoordinate() throws Exception {
+        final NearbyLocationsResult result = queryNearbyStations(
+                Location.coord(Point.fromDouble(48.3652470, 10.8855950))); // Hbf
+        print(result);
+    }
+
+    @Test
+    public void queryDepartures() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("8000013", false); // Hbf
+        print(result);
+    }
+
+    @Test
+    public void queryDeparturesInvalidStation() throws Exception {
+        final QueryDeparturesResult result = queryDepartures("999999", false);
+        assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
+    }
+
+    @Test
+    public void suggestLocations() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Augsburg");
+        print(result);
+    }
+
+    @Test
+    public void suggestLocationsIncomplete() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Kur");
+        print(result);
+    }
+
+    @Test
+    public void suggestLocationsWithUmlautBarfuesserbruecke() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Barfüßerbrücke");
+        print(result);
+        assertThat(result.getLocations(), hasItem(new Location(LocationType.STATION, "780110")));
+    }
+
+    @Test
+    public void suggestLocationsWithUmlautGaertnerstrasse() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Gärtnerstraße");
+        print(result);
+        assertThat(result.getLocations(), hasItem(new Location(LocationType.STATION, "780162")));
+    }
+
+    @Test
+    public void suggestLocationsPOI() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Fuggerei-Museum");
+        print(result);
+        assertThat(result.getLocations(), hasItem(new Location(LocationType.POI,
+                "A=4@O=Augsburg, Fuggerei-Museum (Kultur und Unterhaltung@X=10904796@Y=48369103@U=104@L=990379647@B=1@p=1410875982@")));
+    }
+
+    @Test
+    public void suggestLocationsAddress() throws Exception {
+        final SuggestLocationsResult result = suggestLocations("Milchberg 6");
+        print(result);
+        assertEquals("Augsburg", result.getLocations().get(0).place);
+        assertEquals("Milchberg 6", result.getLocations().get(0).name);
+    }
+
+    @Test
+    public void shortTrip() throws Exception {
+        final Location from = new Location(LocationType.STATION, "781971"); // Königsplatz
+        final Location to = new Location(LocationType.STATION, "8000013"); // Hbf
+        final QueryTripsResult result = queryTrips(from, null, to, new Date(), true, null);
+        print(result);
+        assertEquals(QueryTripsResult.Status.OK, result.status);
+        assertTrue(result.trips.size() > 0);
+        final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
+        print(laterResult);
+        final QueryTripsResult later2Result = queryMoreTrips(laterResult.context, true);
+        print(later2Result);
+        final QueryTripsResult earlierResult = queryMoreTrips(later2Result.context, false);
+        print(earlierResult);
+    }
+}
diff --git a/enabler/test/de/schildbach/pte/live/secrets.properties.template b/enabler/test/de/schildbach/pte/live/secrets.properties.template
index 8a0cdc7a..7e3c3ee9 100644
--- a/enabler/test/de/schildbach/pte/live/secrets.properties.template
+++ b/enabler/test/de/schildbach/pte/live/secrets.properties.template
@@ -7,6 +7,7 @@ bvg.api_authorization =
 vbb.api_authorization =
 vbb.encrypted_salt =
 nvv.api_authorization =
+avv_augsburg.api_authorization =
 sh.api_authorization =
 vbn.api_authorization =
 vbn.encrypted_salt =