Index: applications/editors/josm/plugins/ElevationProfile/build.xml
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 31573)
+++ applications/editors/josm/plugins/ElevationProfile/build.xml	(revision 31574)
@@ -4,5 +4,5 @@
     <property name="commit.message" value="[josm_elevationprofile]"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="8526"/>
+    <property name="plugin.main.version" value="8772"/>
     
     <!-- Configure these properties (replace "..." accordingly).
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java	(revision 31573)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridLayer.java	(revision 31574)
@@ -15,4 +15,5 @@
 import org.openstreetmap.gui.jmapviewer.Tile;
 import org.openstreetmap.gui.jmapviewer.TileController;
+import org.openstreetmap.gui.jmapviewer.TileXY;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
@@ -87,7 +88,5 @@
 				} else {
 					// give some consolation...
-					Point topLeft = mv.getPoint(
-							new LatLon(tileSource.tileYToLat(y, ELE_ZOOM_LEVEL),
-									tileSource.tileXToLon(x, ELE_ZOOM_LEVEL)));
+					Point topLeft = mv.getPoint(new LatLon(tileSource.tileXYToLatLon(x, y, ELE_ZOOM_LEVEL)));
 					t.paint(g, topLeft.x, topLeft.y);
 				}
@@ -170,8 +169,11 @@
 				return;
 
-			x0 = (int)tileSource.lonToTileX(topLeft.lon(),  zoom);
-			y0 = (int)tileSource.latToTileY(topLeft.lat(),  zoom);
-			x1 = (int)tileSource.lonToTileX(botRight.lon(), zoom);
-			y1 = (int)tileSource.latToTileY(botRight.lat(), zoom);
+			TileXY p0 = tileSource.latLonToTileXY(topLeft.lat(), topLeft.lon(), zoom);
+			TileXY p1 = tileSource.latLonToTileXY(botRight.lat(), botRight.lon(), zoom);
+
+			x0 = p0.getXIndex();
+			y0 = p0.getYIndex();
+			x1 = p1.getXIndex();
+			y1 = p1.getYIndex();
 			if (x0 > x1) {
 				int tmp = x0;
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java	(revision 31573)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTile.java	(revision 31574)
@@ -126,9 +126,7 @@
 	 */
 	private Bounds tile2Bounds(final int x, final int y, final int zoom) {
-		Bounds bb = new Bounds(
-				new LatLon(source.tileYToLat(y, zoom), source.tileXToLon(x, zoom)),
-				new LatLon(source.tileYToLat(y + 1, zoom), source.tileXToLon(x + 1, zoom)));
-
-		return bb;
+		return new Bounds(
+				new LatLon(source.tileXYToLatLon(x, y, zoom)),
+				new LatLon(source.tileXYToLatLon(x + 1, y + 1, zoom)));
 	}
 
Index: applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileSource.java
===================================================================
--- applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileSource.java	(revision 31573)
+++ applications/editors/josm/plugins/ElevationProfile/src/org/openstreetmap/josm/plugins/elevation/grid/ElevationGridTileSource.java	(revision 31574)
@@ -14,9 +14,4 @@
     public ElevationGridTileSource(String name) {
         super(new TileSourceInfo(name, "", "eg"));
-    }
-
-    @Override
-    public TileUpdate getTileUpdate() {
-        return TileUpdate.None;
     }