diff --git a/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java b/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java
index 77bc39b..ea8149a 100644
--- a/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java
+++ b/plugins/wikipedia/src/org/wikipedia/WikipediaApp.java
@@ -2,6 +2,7 @@
 package org.wikipedia;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 import java.net.URL;
@@ -45,12 +46,20 @@ public final class WikipediaApp {
             final String url = "http://toolserver.org/~kolossos/geoworld/marks.php?"
                     + "bbox=" + bbox + "&LANG=" + wikipediaLang;
             System.out.println("Wikipedia: GET " + url);
+            return getEntriesFromCoordinates(new URL(url).openStream());
+        } catch (Exception ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    static List<WikipediaEntry> getEntriesFromCoordinates(InputStream in) {
+        try {
             // parse XML document
             final XPathExpression xpathPlacemark = XPathFactory.newInstance().newXPath().compile("//Placemark");
             final XPathExpression xpathName = XPathFactory.newInstance().newXPath().compile("name/text()");
             final XPathExpression xpathCoord = XPathFactory.newInstance().newXPath().compile("Point/coordinates/text()");
             final XPathExpression xpathDescr = XPathFactory.newInstance().newXPath().compile("description");
-            Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new URL(url).openStream());
+            Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(in);
             NodeList nodes = (NodeList) xpathPlacemark.evaluate(doc, XPathConstants.NODESET);
             // construct WikipediaEntry for each XML element
             List<WikipediaEntry> entries = new ArrayList<WikipediaEntry>(nodes.getLength());
@@ -60,7 +69,7 @@ public final class WikipediaApp {
                     continue;
                 }
                 final String name = xpathName.evaluate(nodes.item(i));
-                final String descr = xpathDescr.evaluate(nodes.item(i));
+                final String descr = xpathDescr.evaluate(nodes.item(i)).replace("%26amp%3B", "&");
                 entries.add(new WikipediaEntry(name, descr,
                         new LatLon(Double.parseDouble(coord[1]), Double.parseDouble(coord[0]))));
             }
diff --git a/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java b/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java
index 1b049e5..da3b479 100644
--- a/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java
+++ b/plugins/wikipedia/test/org/wikipedia/WikipediaAppTest.java
@@ -7,6 +7,9 @@ import org.openstreetmap.josm.tools.Utils;
 import org.wikipedia.WikipediaApp.WikipediaEntry;
 import org.wikipedia.WikipediaApp.WikipediaLangArticle;
 
+import java.io.ByteArrayInputStream;
+import java.io.StringBufferInputStream;
+import java.io.StringReader;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -125,4 +128,15 @@ public class WikipediaAppTest {
             }
         }));
     }
+
+    @Test
+    public void testTicket8491() throws Exception {
+        final String kml = "<kml xmlns=\"http://www.opengis.net/kml/2.2\">\n" +
+                "<Document>\n" +
+                "<Placemark><name>Sternheim &amp; Emanuel</name> <visibility>1</visibility>  <description><![CDATA[ <a target=\"_blank\" href=\"//de.wikipedia.org/wiki/Sternheim%20%26amp%3B%20Emanuel\">de.Wikipedia</a><br><div style=\" padding-top: 0.5em; padding-left: 0.5em; width:190px;height:250px; border:10px;\" > <img alt=\"1886_Stammhaus_Sternheim_&amp;_Emanuel_Große_Packhofstraße_44_Hannover.jpg\"  src=\"//upload.wikimedia.org/wikipedia/commons/thumb/9/95/1886_Stammhaus_Sternheim_&amp;_Emanuel_Große_Packhofstraße_44_Hannover.jpg/180px-1886_Stammhaus_Sternheim_&amp;_Emanuel_Große_Packhofstraße_44_Hannover.jpg\"></a></div><br><small>Source: de<br> style: landmark </small>]]></description>     <styleUrl>#landmark</styleUrl>    <Point><coordinates>9.736904,52.373235,0</coordinates></Point></Placemark>\n" +
+                "</Document>\n" +
+                "</kml>\n";
+        final List<WikipediaEntry> entries = WikipediaApp.getEntriesFromCoordinates(new ByteArrayInputStream(kml.getBytes(Utils.UTF_8)));
+        assertThat(entries.get(0).wikipediaArticle, is("Sternheim & Emanuel"));
+    }
 }