diff --git a/enabler/src/de/schildbach/pte/VbbProvider.java b/enabler/src/de/schildbach/pte/VbbProvider.java
index 6a94e250..b8d163da 100644
--- a/enabler/src/de/schildbach/pte/VbbProvider.java
+++ b/enabler/src/de/schildbach/pte/VbbProvider.java
@@ -188,7 +188,7 @@ public class VbbProvider extends AbstractHafasProvider
 
 	public List<Location> autocompleteStations(final CharSequence constraint) throws IOException
 	{
-		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), ISO_8859_1));
+		final String uri = String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), UTF_8));
 
 		return jsonGetStops(uri);
 	}
diff --git a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
index ba4a0d6e..f6c24634 100644
--- a/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/BvgProviderLiveTest.java
@@ -22,6 +22,7 @@ import static junit.framework.Assert.assertEquals;
 import java.util.Date;
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import de.schildbach.pte.BvgProvider;
@@ -80,6 +81,16 @@ public class BvgProviderLiveTest extends AbstractProviderLiveTest
 		assertEquals(QueryDeparturesResult.Status.INVALID_STATION, resultPlan.status);
 	}
 
+	@Test
+	public void autocompleteUmlaut() throws Exception
+	{
+		final List<Location> autocompletes = provider.autocompleteStations("Güntzelstr.");
+
+		print(autocompletes);
+
+		Assert.assertEquals("Güntzelstr. (U)", autocompletes.get(0).name);
+	}
+
 	@Test
 	public void autocompleteIncomplete() throws Exception
 	{
diff --git a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
index 7e133e4d..fdb992e6 100644
--- a/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
+++ b/enabler/test/de/schildbach/pte/live/VbbProviderLiveTest.java
@@ -20,6 +20,7 @@ package de.schildbach.pte.live;
 import java.util.Date;
 import java.util.List;
 
+import org.junit.Assert;
 import org.junit.Test;
 
 import de.schildbach.pte.NetworkProvider.Accessibility;
@@ -68,9 +69,11 @@ public class VbbProviderLiveTest extends AbstractProviderLiveTest
 	@Test
 	public void autocompleteUmlaut() throws Exception
 	{
-		final List<Location> autocompletes = provider.autocompleteStations("Hedwigshöhe");
+		final List<Location> autocompletes = provider.autocompleteStations("Güntzelstr.");
 
 		print(autocompletes);
+
+		Assert.assertEquals("Güntzelstr. (U)", autocompletes.get(0).name);
 	}
 
 	@Test