diff --git a/MasterPassword/Java/build.gradle b/MasterPassword/Java/build.gradle
index f69dfc8d..611ba02c 100644
--- a/MasterPassword/Java/build.gradle
+++ b/MasterPassword/Java/build.gradle
@@ -1,5 +1,4 @@
 allprojects    {
-    apply plugin: 'maven'
     //apply plugin: 'findbugs'
 
     group = 'com.lyndir.masterpassword'
diff --git a/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar
index 6ffa2378..815146ab 100644
Binary files a/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar and b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties
index 220dc3d9..c50ada7f 100644
--- a/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties
+++ b/MasterPassword/Java/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 06 10:38:22 EST 2017
+#Wed Feb 08 01:04:17 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
diff --git a/MasterPassword/Java/gradlew b/MasterPassword/Java/gradlew
index 9aa616c2..4453ccea 100755
--- a/MasterPassword/Java/gradlew
+++ b/MasterPassword/Java/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/MasterPassword/Java/masterpassword-algorithm/build.gradle b/MasterPassword/Java/masterpassword-algorithm/build.gradle
index edc54e16..6e5b3f9f 100644
--- a/MasterPassword/Java/masterpassword-algorithm/build.gradle
+++ b/MasterPassword/Java/masterpassword-algorithm/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'java'
 description = 'Master Password Algorithm Implementation'
 
 dependencies {
-    compile( 'com.lyndir.lhunath.opal:opal-system:1.6-p9' ) {
+    compile( 'com.lyndir.lhunath.opal:opal-system:1.6-p10' ) {
         exclude( module: 'joda-time' )
     }
     compile 'com.lambdaworks:scrypt:1.4.0'
diff --git a/MasterPassword/Java/masterpassword-android/build.gradle b/MasterPassword/Java/masterpassword-android/build.gradle
index 4aed8a5c..c2b8aa33 100644
--- a/MasterPassword/Java/masterpassword-android/build.gradle
+++ b/MasterPassword/Java/masterpassword-android/build.gradle
@@ -1,9 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
+    signingConfigs {
+        lyndir {
+            keyAlias 'lyndir'
+            keyPassword 'JaxeMeruDafc0('
+            storeFile file('/Users/lhunath/annex/secret/lyndir.keystore')
+            storePassword 'JaxeMeruDafc0('
+        }
+    }
     compileSdkVersion 25
     buildToolsVersion "25.0.0"
-
     defaultConfig {
         applicationId "com.lyndir.masterpassword"
         minSdkVersion 19
@@ -20,8 +27,10 @@ android {
 dependencies {
     compile project( ':masterpassword-algorithm' )
     compile project( ':masterpassword-tests' )
-    compile 'com.android.support:appcompat-v7:25.1.1'
-    compile 'com.jakewharton:butterknife:8.5.1'
-    compile 'com.lambdaworks:scrypt:1.4.0-android'
+
+    // Android dependencies
     compile 'org.slf4j:slf4j-android:1.7.13-underscore'
+    compile 'com.jakewharton:butterknife:8.5.1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:8.5.1'
+    compile files('libs/scrypt-1.4.0-native.jar')
 }
diff --git a/MasterPassword/Java/masterpassword-android/libs/scrypt-1.4.0-native.jar b/MasterPassword/Java/masterpassword-android/libs/scrypt-1.4.0-native.jar
new file mode 100644
index 00000000..94702568
Binary files /dev/null and b/MasterPassword/Java/masterpassword-android/libs/scrypt-1.4.0-native.jar differ