diff --git a/app/app.iml b/app/app.iml
index 5a04741..46c4291 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -93,16 +93,20 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="slf4j-log4j12-1.7.12" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="androidsvg-1.2.1" level="project" />
     <orderEntry type="library" exported="" name="mapsforge-map-release-0.5.2" level="project" />
     <orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="mapsforge-core-release-0.5.2" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
+    <orderEntry type="library" exported="" name="log4j-1.2.17" level="project" />
+    <orderEntry type="library" exported="" name="osmdroid-android-4.3" level="project" />
     <orderEntry type="library" exported="" name="weatherlib-1.5.8" level="project" />
     <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
     <orderEntry type="library" exported="" name="mapsforge-map-android-release-0.5.2" level="project" />
     <orderEntry type="library" exported="" name="weatherlib_okhttpclient-1.5.8" level="project" />
+    <orderEntry type="library" exported="" name="slf4j-api-1.7.12" level="project" />
     <orderEntry type="library" exported="" name="mapsforge-map-reader-release-0.5.2" level="project" />
     <orderEntry type="library" exported="" name="design-22.2.0" level="project" />
     <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
diff --git a/app/build.gradle b/app/build.gradle
index 41ca929..dafd25d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,12 +24,11 @@
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:21.0.3'
     compile 'com.android.support:design:22.2.0'
-    compile files('libs/mapsforge-core-release-0.5.2.jar')
-    compile files('libs/mapsforge-map-android-release-0.5.2.jar')
-    compile files('libs/mapsforge-map-reader-release-0.5.2.jar')
-    compile files('libs/mapsforge-map-release-0.5.2.jar')
     compile files('libs/androidsvg-1.2.1.jar')
     compile 'com.survivingwithandroid:weatherlib:1.5.8'
     compile 'com.survivingwithandroid:weatherlib_okhttpclient:1.5.8'
     compile 'com.squareup.okhttp:okhttp:2.0.+'
+    compile 'org.slf4j:slf4j-log4j12:1.7.12'
+    compile 'org.osmdroid:osmdroid-parent:4.3'
+    compile 'org.osmdroid:osmdroid-android:4.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2153eb6..dc62403 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET" />
 
     <application
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
index 7eefbeb..877d6ab 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/MainActivity.java
@@ -48,15 +48,10 @@
 import com.survivingwithandroid.weather.lib.provider.openweathermap.OpenweathermapProviderType;
 import com.survivingwithandroid.weather.lib.request.WeatherRequest;
 
-import org.mapsforge.core.model.LatLong;
-import org.mapsforge.map.android.graphics.AndroidGraphicFactory;
-import org.mapsforge.map.android.util.AndroidUtil;
-import org.mapsforge.map.android.view.MapView;
-import org.mapsforge.map.layer.cache.TileCache;
-import org.mapsforge.map.layer.renderer.TileRendererLayer;
-import org.mapsforge.map.reader.MapDataStore;
-import org.mapsforge.map.reader.MapFile;
-import org.mapsforge.map.rendertheme.InternalRenderTheme;
+import org.osmdroid.api.IMapController;
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
+import org.osmdroid.util.GeoPoint;
+import org.osmdroid.views.MapView;
 
 import java.io.File;
 import java.lang.reflect.Type;
@@ -86,8 +81,6 @@
     private WeatherClient weatherClient;
 
     private MapView mapView;
-    private TileCache tileCache;
-    private TileRendererLayer tileRendererLayer;
 
     private ActionBarDrawerToggle drawerToggle;
     private String[] fountainSizes;
@@ -108,21 +101,14 @@
 
         FrameLayout frameLayout = (FrameLayout) findViewById(R.id.container);
 
-        AndroidGraphicFactory.createInstance(this.getApplication());
-
-        mapView = new MapView(this);
-        frameLayout.addView(mapView);
-
-        mapView.setClickable(true);
-        mapView.getMapScaleBar().setVisible(true);
+        MapView mapView = new MapView(getApplicationContext(), 256);
+        mapView.setTileSource(TileSourceFactory.MAPNIK);
         mapView.setBuiltInZoomControls(true);
-        mapView.getMapZoomControls().setZoomLevelMin((byte) 10);
-        mapView.getMapZoomControls().setZoomLevelMax((byte) 20);
-
-        // create a tile cache of suitable size
-        tileCache = AndroidUtil.createTileCache(this, "mapcache",
-                mapView.getModel().displayModel.getTileSize(), 1f,
-                mapView.getModel().frameBufferModel.getOverdrawFactor());
+        mapView.setMultiTouchControls(true);
+        IMapController mapController = mapView.getController();
+        mapController.setZoom(9);
+        mapController.setCenter(new GeoPoint(37.9777, 23.7277));
+        frameLayout.addView(mapView);
 
         mTitle = mDrawerTitle = getTitle();
 
@@ -339,19 +325,6 @@
     @Override
     protected void onStart() {
         super.onStart();
-
-        mapView.getModel().mapViewPosition.setCenter(new LatLong(37.9777, 23.7277));
-        mapView.getModel().mapViewPosition.setZoomLevel((byte) 12);
-
-        // tile renderer layer using internal render theme
-        MapDataStore mapDataStore = new MapFile(getMapFile());
-        tileRendererLayer = new TileRendererLayer(tileCache, mapDataStore,
-                mapView.getModel().mapViewPosition, false, true, AndroidGraphicFactory.INSTANCE);
-        tileRendererLayer.setXmlRenderTheme(InternalRenderTheme.OSMARENDER);
-
-        // only once a layer is associated with a mapView the rendering starts
-        mapView.getLayerManager().getLayers().add(tileRendererLayer);
-
     }
 
     @Override
@@ -369,7 +342,6 @@
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        this.mapView.destroyAll();
     }
 
     private File getMapFile() {