diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..d685b9c
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,15 @@
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SRC_FILES := $(call all-subdir-java-files)
+
+LOCAL_PROGUARD_ENABLED := disabled
+
+LOCAL_PACKAGE_NAME := CryptfsPasswordManager
+
+
+include $(BUILD_PACKAGE)
+
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/res/layout/activity_main.xml b/res/layout/activity_main.xml
index b8877bc..79fa223 100644
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -29,7 +29,7 @@
         android:id="@+id/currentPasswdLabel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Current password:" />
+        android:text="@string/current_passwd_pmt" />
 
     <EditText
         android:id="@+id/currentPasswdText"
@@ -46,7 +46,7 @@
         android:id="@+id/newPasswdLabel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="New password:" />
+        android:text="@string/new_passwd_pmt" />
 
     <EditText
         android:id="@+id/newPasswordText"
@@ -60,7 +60,7 @@
         android:id="@+id/newPasswdConfirmLabel"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Confirm new password:" />
+        android:text="@string/confirm_passwd_pmt" />
 
     <EditText
         android:id="@+id/confirmNewPasswdText"
@@ -75,6 +75,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/control_margin"
-        android:text="Change password" />
+        android:text="@string/change_passwd_btn" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4888c17..6a6631a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -14,9 +14,13 @@
         to set the password manually BEFORE rebooting.</string>
     <string name="successfuly_changed_password">Successfuly changed device encryption password.</string>
     <string name="password_mismatch">Passwords don\'t match.</string>
+    <string name="confirm_passwd_pmt">Confirm password:</string>
     <string name="confirmation_passwd_required">Confirmation password is required.</string>
     <string name="new_passwd_required">New password is required.</string>
     <string name="current_passwd_required">Current password is required.</string>
+    <string name="current_passwd_pmt">Current password:</string>
+    <string name="new_passwd_pmt">New password:</string>
+    <string name="change_passwd_btn">Change password</string>
     <string name="cannot_get_su">Cannot get superuser access, exiting.</string>
     <string name="no_su_apk">No superuser package found, exiting.</string>
     <string name="device_not_encrypted">This device is not encrypted, exiting.</string>