diff --git a/.travis.yml b/.travis.yml
index 1f171bfc2..97079bf7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,7 @@
 sudo: false
 
 language: android
+jdk: oraclejdk8
 
 android:
     components:
diff --git a/app/build.gradle b/app/build.gradle
index 3d0fbd39d..ab3183b36 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -52,7 +52,7 @@ dependencies {
     compile 'org.apache.httpcomponents:httpclient:4.2.1'
     compile 'org.apache.httpcomponents:httpcore:4.2.1'
     compile 'org.apache.httpcomponents:httpmime:4.2.1'
-    compile 'org.osmdroid:osmdroid-android:4.2'
+    compile 'org.osmdroid:osmdroid-android:5.5:release@aar'
     compile 'oauth.signpost:signpost-commonshttp4:1.2.1.2'
     compile 'oauth.signpost:signpost-core:1.2.1.2'
     compile 'org.slf4j:slf4j-android:1.6.1-RC1'
diff --git a/app/src/main/java/me/guillaumin/android/osmtracker/activity/DisplayTrackMap.java b/app/src/main/java/me/guillaumin/android/osmtracker/activity/DisplayTrackMap.java
index dbc558868..072c28abc 100644
--- a/app/src/main/java/me/guillaumin/android/osmtracker/activity/DisplayTrackMap.java
+++ b/app/src/main/java/me/guillaumin/android/osmtracker/activity/DisplayTrackMap.java
@@ -11,13 +11,12 @@
 import me.guillaumin.android.osmtracker.overlay.WayPointsOverlay;
 
 import org.osmdroid.api.IMapController;
-import org.osmdroid.contributor.util.constants.OpenStreetMapContributorConstants;
 import org.osmdroid.tileprovider.tilesource.ITileSource;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.MapView;
 import org.osmdroid.views.overlay.PathOverlay;
-import org.osmdroid.views.overlay.SimpleLocationOverlay;
+import org.osmdroid.views.overlay.mylocation.SimpleLocationOverlay;
 
 import android.app.Activity;
 import android.content.ContentUris;
@@ -47,7 +46,7 @@
  * @author Viesturs Zarins
  *
  */
-public class DisplayTrackMap extends Activity implements OpenStreetMapContributorConstants{
+public class DisplayTrackMap extends Activity {
 
 	private static final String TAG = DisplayTrackMap.class.getSimpleName();
 	
diff --git a/app/src/main/java/me/guillaumin/android/osmtracker/overlay/WayPointsOverlay.java b/app/src/main/java/me/guillaumin/android/osmtracker/overlay/WayPointsOverlay.java
index ccf227f75..dc520aa19 100644
--- a/app/src/main/java/me/guillaumin/android/osmtracker/overlay/WayPointsOverlay.java
+++ b/app/src/main/java/me/guillaumin/android/osmtracker/overlay/WayPointsOverlay.java
@@ -7,7 +7,6 @@
 import me.guillaumin.android.osmtracker.db.TrackContentProvider;
 import me.guillaumin.android.osmtracker.db.TrackContentProvider.Schema;
 
-import org.osmdroid.DefaultResourceProxyImpl;
 import org.osmdroid.api.IMapView;
 import org.osmdroid.util.GeoPoint;
 import org.osmdroid.views.overlay.ItemizedOverlay;
@@ -36,7 +35,7 @@ public WayPointsOverlay(
 			final long trackId
 			)
 	{
-		super(pDefaultMarker, new DefaultResourceProxyImpl(pContext));
+		super(pDefaultMarker);
 		
 		this.trackId = trackId;
 		this.pContentResolver = pContext.getContentResolver();
diff --git a/build.gradle b/build.gradle
index 88d246d44..e7e3c60b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.3'
+        classpath 'com.android.tools.build:gradle:2.2.2'
     }
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0c71e760d..95f101e8f 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 10 15:27:10 PDT 2013
+#Sat Nov 19 17:50:46 PST 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip