Index: src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java
===================================================================
--- src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java	(Revision 25558)
+++ src/org/openstreetmap/gui/jmapviewer/tilesources/OsmTileSource.java	(Arbeitskopie)
@@ -4,6 +4,8 @@
 
     public static final String MAP_MAPNIK = "http://tile.openstreetmap.org";
     public static final String MAP_OSMA = "http://tah.openstreetmap.org/Tiles";
+    public static final String MAP_OEPNV = "http://tile.xn--pnvkarte-m4a.de/tilegen";
+    public static final String MAP_HIKE = "http://toolserver.org/tiles/hikebike";
 
     public static class Mapnik extends AbstractOsmTileSource {
         public Mapnik() {
@@ -16,6 +18,36 @@
 
     }
 
+    public static class HikeBike extends AbstractOsmTileSource {
+        public HikeBike() {
+            super("HikeBikeMap", MAP_HIKE);
+        }
+
+        public TileUpdate getTileUpdate() {
+            return TileUpdate.IfNoneMatch;
+        }
+
+        @Override
+        public int getMaxZoom() {
+            return 17;
+        }
+    }
+
+    public static class Oepnv extends AbstractOsmTileSource {
+        public Oepnv() {
+            super("ÖPNV-Karte", MAP_OEPNV);
+        }
+
+        public TileUpdate getTileUpdate() {
+            return TileUpdate.IfNoneMatch;
+        }
+
+        @Override
+        public int getMaxZoom() {
+            return 17;
+        }
+    }
+
     public static class CycleMap extends AbstractOsmTileSource {
 
         private static final String PATTERN = "http://%s.tile.opencyclemap.org/cycle";
Index: src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java
===================================================================
--- src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(Revision 3974)
+++ src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java	(Arbeitskopie)
@@ -140,7 +140,10 @@
                 return Arrays.<TileSource>asList(
                         new RenamedSourceDecorator(new OsmTileSource.Mapnik(), "Mapnik"),
                         new RenamedSourceDecorator(new OsmTileSource.TilesAtHome(), "Osmarender"),
-                        new RenamedSourceDecorator(new OsmTileSource.CycleMap(), "Cyclemap")
+                        new RenamedSourceDecorator(new OsmTileSource.CycleMap(), "Cyclemap"),
+                        new RenamedSourceDecorator(new OsmTileSource.HikeBike(), "HikeBikeMap"),
+                        new RenamedSourceDecorator(new OsmTileSource.Oepnv(), "ÖPNV-Karte")
+
                 );
             }
         });