diff --git a/libs/mapsforge-map-0.2.4.jar b/libs/mapsforge-map-0.2.4.jar
new file mode 100644
index 0000000..ac08d7a
Binary files /dev/null and b/libs/mapsforge-map-0.2.4.jar differ
diff --git a/mapview.xml.tpl b/mapview.xml.tpl
index 3695372..433c72a 100644
--- a/mapview.xml.tpl
+++ b/mapview.xml.tpl
@@ -4,7 +4,7 @@
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
 	>
-<com.google.android.maps.MapView
+<org.mapsforge.android.maps.MapView
 	android:id="@+id/mapview"
 	android:layout_width="fill_parent"
 	android:layout_height="fill_parent"
diff --git a/proguard.cfg b/proguard.cfg
index 2be770c..c3cffe0 100644
--- a/proguard.cfg
+++ b/proguard.cfg
@@ -1,4 +1,5 @@
 -dontwarn scala.**
+-dontwarn org.mapsforge.android.maps.**
 -dontnote scala.**
 -dontobfuscate
 -optimizationpasses 5
@@ -57,6 +58,7 @@
 -keepclassmembers class **.R$* {
 	public static <fields>;
 }
+-keepclasseswithmembers class scala.runtime.ArrayRuntime
 -keep public interface scala.ScalaObject
 
 -keepclassmembers enum * {
diff --git a/src/MapAct.scala b/src/MapAct.scala
index 8db7574..5e796e9 100644
--- a/src/MapAct.scala
+++ b/src/MapAct.scala
@@ -11,7 +11,7 @@ import _root_.android.view.{Menu, MenuItem, View}
 import _root_.android.widget.SimpleCursorAdapter
 import _root_.android.widget.Spinner
 import _root_.android.widget.TextView
-import _root_.com.google.android.maps._
+import _root_.org.mapsforge.android.maps._
 import _root_.scala.collection.mutable.ArrayBuffer
 import _root_.java.util.ArrayList
 
@@ -41,7 +41,8 @@ class MapAct extends MapActivity with UIHelper {
 
 		locReceiver.startTask(null)
 		showObjects = prefs.getShowObjects()
-		mapview.setSatellite(prefs.getShowSatellite())
+		//mapview.setSatellite(prefs.getShowSatellite())
+		mapview.setMapFile("/sdcard/aprsdroid.map")
 		mapview.getOverlays().add(staoverlay)
 
 		// listen for new positions
@@ -61,7 +62,7 @@ class MapAct extends MapActivity with UIHelper {
 		super.onDestroy()
 		unregisterReceiver(locReceiver)
 	}
-	override def isRouteDisplayed() = false
+	//override def isRouteDisplayed() = false
 
 	override def onCreateOptionsMenu(menu : Menu) : Boolean = {
 		getMenuInflater().inflate(R.menu.options, menu);
@@ -80,7 +81,7 @@ class MapAct extends MapActivity with UIHelper {
 		case R.id.satellite =>
 			val newState = prefs.toggleBoolean("show_satellite", false)
 			mi.setChecked(newState)
-			mapview.setSatellite(newState)
+			//mapview.setSatellite(newState)
 			true
 		case _ => super.onOptionsItemSelected(mi)
 		}
@@ -100,7 +101,7 @@ class MapAct extends MapActivity with UIHelper {
 				cursor.moveToFirst()
 				val lat = cursor.getInt(StorageDatabase.Station.COLUMN_LAT)
 				val lon = cursor.getInt(StorageDatabase.Station.COLUMN_LON)
-				mapview.getController().animateTo(new GeoPoint(lat, lon))
+				mapview.getController().setCenter(new GeoPoint(lat, lon))
 			}
 			cursor.close()
 		}
@@ -194,8 +195,7 @@ class StationOverlay(icons : Drawable, context : MapAct, db : StorageDatabase) e
 		c.drawPath(path, tracePaint)
 	}
 
-	override def draw(c : Canvas, m : MapView, shadow : Boolean) : Unit = {
-		if (shadow) return;
+	override def drawOverlayBitmap(c : Canvas, dp : Point, proj : Projection, zoom : Byte) : Unit = {
 
 		val fontSize = symbolSize*7/8
 		val textPaint = new Paint()
@@ -223,8 +223,6 @@ class StationOverlay(icons : Drawable, context : MapAct, db : StorageDatabase) e
 		val iconbitmap = icons.asInstanceOf[BitmapDrawable].getBitmap
 
 		val p = new Point()
-		val proj = m.getProjection()
-		val zoom = m.getZoomLevel()
 		val (width, height) = (c.getWidth(), c.getHeight())
 		val ss = symbolSize/2
 		for (s <- stations) {