diff --git a/.settings/gradle.prefs b/.settings/gradle.prefs
deleted file mode 100644
index e1580259467..00000000000
--- a/.settings/gradle.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "1.0": {
-    "project_path": ":",
-    "project_dir": "C:\\workspace\\geogebra",
-    "connection_project_dir": "C:\\workspace\\geogebra",
-    "connection_gradle_user_home": null,
-    "connection_gradle_distribution": "GRADLE_DISTRIBUTION(WRAPPER)",
-    "connection_java_home": null,
-    "connection_jvm_arguments": "",
-    "connection_arguments": ""
-  }
-}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index ee8be7771f4..2e97b0766a0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,7 +42,7 @@ subprojects {
 
 task wrapper(type: Wrapper) {
 	description = 'Creates the gradle wrapper'
-	gradleVersion = '2.3'
+	gradleVersion = '2.13'
 }
 
 // eclipse related tasks
diff --git a/giac/build.gradle b/giac/build.gradle
index bcc884ebfcd..0aec6cd2240 100644
--- a/giac/build.gradle
+++ b/giac/build.gradle
@@ -304,14 +304,14 @@ task testMinigiacExecutable (dependsOn: 'installMinigiacExecutable', type: Exec)
 
 task androidCopyCrystaxSo (dependsOn: ':giac:giac-android:copyCrystaxSo')
 
-task androidCopyEabiLibjavagiacSo (dependsOn: 'androideabiJavagiacSharedLibrary', type: Copy) {
+task androidCopyEabiLibjavagiacSo (dependsOn: 'javagiacAndroideabiSharedLibrary', type: Copy) {
     description 'Copies libjavagiac.so files to the src/android folder.'
     from 'build/binaries/javagiacSharedLibrary/androideabi'
     into 'giac-android/src/main/jniLibs/armeabi-v7a'
     include ('libjavagiac.so')
     }
 
-task androidCopyX86LibjavagiacSo (dependsOn: 'androidx86JavagiacSharedLibrary', type: Copy) {
+task androidCopyX86LibjavagiacSo (dependsOn: 'javagiacAndroidx86SharedLibrary', type: Copy) {
     description 'Copies libjavagiac.so files to the src/android folder.'
     from 'build/binaries/javagiacSharedLibrary/androidx86'
     into 'giac-android/src/main/jniLibs/x86'
@@ -324,7 +324,7 @@ task androidAar (dependsOn: ['androidCopyCrystaxSo', 'androidCopyEabiLibjavagiac
 
 task run (dependsOn: 'installMinigiacExecutable', type: Exec) {
     description "Runs Giac's minigiac terminal"
-    commandLine 'build/install/minigiacExecutable/minigiac'
+    commandLine 'build/install/minigiac/minigiac'
     standardInput = System.in
     }
 
diff --git a/giac/giac-android/build.gradle b/giac/giac-android/build.gradle
index e6b32e80d04..ccbfd12c36e 100644
--- a/giac/giac-android/build.gradle
+++ b/giac/giac-android/build.gradle
@@ -7,19 +7,19 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.1'
-        classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
+        classpath 'com.android.tools.build:gradle:2.1.0'
+        // classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.+'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
     }
 }
 
-apply plugin: 'android-sdk-manager'
+// apply plugin: 'android-sdk-manager'
 apply plugin: 'com.android.library'
 
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "22.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         minSdkVersion 8
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 7a1c437850e..d2ba467b6bd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Apr 27 13:26:00 CEST 2015
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
+#Thu May 05 14:34:11 CEST 2016
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-bin.zip