diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
index f6ba50073e..38697f2e4b 100644
--- a/OsmAnd/build.gradle
+++ b/OsmAnd/build.gradle
@@ -385,10 +385,10 @@ dependencies {
 	// compile project(':eclipse-compile:design')
 	// compile project(':eclipse-compile:cardview')
 	// compile project(':eclipse-compile:gridlayout')
-	compile 'com.android.support:gridlayout-v7:25.3.1'
-	compile 'com.android.support:cardview-v7:25.3.1'
-	compile 'com.android.support:appcompat-v7:25.3.1'
-	compile 'com.android.support:design:25.3.1'
+	compile 'com.android.support:gridlayout-v7:25.+'
+	compile 'com.android.support:cardview-v7:25.+'
+	compile 'com.android.support:appcompat-v7:25.+'
+	compile 'com.android.support:design:25.+'
 	compile fileTree(include: ['*.jar'], exclude: ['QtAndroid-bundled.jar', 'QtAndroidAccessibility-bundled.jar', 'OsmAndCore_android.jar', 'OsmAndCore_wrapper.jar', 'android-support-multidex.jar'], dir: 'libs')
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
diff --git a/build.gradle b/build.gradle
index d1b579b89c..5cad9d08ae 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.3'
+        classpath 'com.android.tools.build:gradle:2.+'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 8679e4507f..b12618a3f9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip