diff --git a/MasterPassword/Java/masterpassword-android/AndroidManifest.xml b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
new file mode 100644
index 00000000..c18ea87d
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/AndroidManifest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.lyndir.lhunath.masterpassword" android:versionCode="1" android:versionName="GIT-SNAPSHOT">
+
+  <uses-sdk android:minSdkVersion="8"
+            android:targetSdkVersion="16" />
+
+  <application android:icon="@drawable/icon" android:label="@string/app_name">
+    <activity android:name=".HelloAndroidActivity">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+  </application>
+
+</manifest>
+
diff --git a/MasterPassword/Java/masterpassword-android/default.properties b/MasterPassword/Java/masterpassword-android/default.properties
new file mode 100644
index 00000000..d05aaefc
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/default.properties
@@ -0,0 +1,3 @@
+# File used by Eclipse to determine the target system
+# Project target.
+target=android-16
\ No newline at end of file
diff --git a/MasterPassword/Java/masterpassword-android/pom.xml b/MasterPassword/Java/masterpassword-android/pom.xml
new file mode 100644
index 00000000..f89ab833
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/pom.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <!-- PROJECT METADATA -->
+    <parent>
+        <groupId>com.lyndir.lhunath.masterpassword</groupId>
+        <artifactId>masterpassword</artifactId>
+        <version>GIT-SNAPSHOT</version>
+    </parent>
+
+    <name>Master Password Android</name>
+    <description>An Android application to the Master Password algorithm</description>
+
+    <groupId>com.lyndir.lhunath.masterpassword</groupId>
+    <artifactId>masterpassword-android</artifactId>
+    <packaging>apk</packaging>
+
+    <!-- BUILD CONFIGURATION -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
+                <artifactId>android-maven-plugin</artifactId>
+
+                <!--configuration>
+                    <proguard>
+                        <skip>false</skip>
+                        <config>proguard.cfg</config>
+                    </proguard>
+                </configuration-->
+            </plugin>
+        </plugins>
+    </build>
+
+    <!-- DEPENDENCY MANAGEMENT -->
+    <dependencies>
+
+        <!-- PROJECT REFERENCES -->
+        <dependency>
+            <groupId>com.lyndir.lhunath.masterpassword</groupId>
+            <artifactId>masterpassword-algorithm</artifactId>
+            <version>GIT-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.android</groupId>
+            <artifactId>android</artifactId>
+            <version>4.1.1.4</version>
+            <scope>provided</scope>
+        </dependency>
+
+    </dependencies>
+
+</project>
diff --git a/MasterPassword/Java/masterpassword-android/proguard.cfg b/MasterPassword/Java/masterpassword-android/proguard.cfg
new file mode 100644
index 00000000..251d06bd
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/proguard.cfg
@@ -0,0 +1,5 @@
+-ignorewarnings
+-dontoptimize
+-dontobfuscate
+-dontskipnonpubliclibraryclasses
+-dontskipnonpubliclibraryclassmembers
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-hdpi/icon.png b/MasterPassword/Java/masterpassword-android/res/drawable-hdpi/icon.png
new file mode 100644
index 00000000..afc1a0ef
Binary files /dev/null and b/MasterPassword/Java/masterpassword-android/res/drawable-hdpi/icon.png differ
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-ldpi/icon.png b/MasterPassword/Java/masterpassword-android/res/drawable-ldpi/icon.png
new file mode 100644
index 00000000..5a899241
Binary files /dev/null and b/MasterPassword/Java/masterpassword-android/res/drawable-ldpi/icon.png differ
diff --git a/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png
new file mode 100644
index 00000000..7e079bb2
Binary files /dev/null and b/MasterPassword/Java/masterpassword-android/res/drawable-mdpi/icon.png differ
diff --git a/MasterPassword/Java/masterpassword-android/res/layout/main.xml b/MasterPassword/Java/masterpassword-android/res/layout/main.xml
new file mode 100644
index 00000000..3a5f117d
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView  
+    android:layout_width="fill_parent" 
+    android:layout_height="wrap_content" 
+    android:text="@string/hello"
+    />
+</LinearLayout>
diff --git a/MasterPassword/Java/masterpassword-android/res/values/strings.xml b/MasterPassword/Java/masterpassword-android/res/values/strings.xml
new file mode 100644
index 00000000..7578731e
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="hello">Hello masterpassword-android!</string>
+    <string name="app_name">masterpassword-android</string>
+</resources>
diff --git a/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/HelloAndroidActivity.java b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/HelloAndroidActivity.java
new file mode 100644
index 00000000..0e587773
--- /dev/null
+++ b/MasterPassword/Java/masterpassword-android/src/main/java/com/lyndir/lhunath/masterpassword/HelloAndroidActivity.java
@@ -0,0 +1,25 @@
+package com.lyndir.lhunath.masterpassword;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.util.Log;
+
+public class HelloAndroidActivity extends Activity {
+
+    private static String TAG = "masterpassword-android";
+
+    /**
+     * Called when the activity is first created.
+     * @param savedInstanceState If the activity is being re-initialized after 
+     * previously being shut down then this Bundle contains the data it most 
+     * recently supplied in onSaveInstanceState(Bundle). <b>Note: Otherwise it is null.</b>
+     */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+		Log.i(TAG, "onCreate");
+        setContentView(R.layout.main);
+    }
+
+}
+
diff --git a/MasterPassword/Java/pom.xml b/MasterPassword/Java/pom.xml
index a0c8bf37..7db9107a 100644
--- a/MasterPassword/Java/pom.xml
+++ b/MasterPassword/Java/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.lyndir.lhunath</groupId>
         <artifactId>lyndir</artifactId>
-        <version>1.17</version>
+        <version>GIT-SNAPSHOT</version>
     </parent>
 
     <name>Master Password</name>
@@ -21,6 +21,7 @@
     <modules>
         <module>masterpassword-algorithm</module>
         <module>masterpassword-cli</module>
+        <module>masterpassword-android</module>
     </modules>
 
     <!-- REMOTE ARTIFACT REPOSITORIES -->