diff --git a/unix/Android.mk b/unix/Android.mk
new file mode 100644
index 0000000..ea7451c
--- /dev/null
+++ b/unix/Android.mk
@@ -0,0 +1,3 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(call first-makefiles-under,$(LOCAL_PATH))
diff --git a/unix/vncpasswd/Android.mk b/unix/vncpasswd/Android.mk
new file mode 100644
index 0000000..7bcb7ef
--- /dev/null
+++ b/unix/vncpasswd/Android.mk
@@ -0,0 +1,35 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_CPP_EXTENSION := cxx
+
+LOCAL_SRC_FILES :=  \
+    vncpasswd.cxx
+
+LOCAL_CFLAGS := -Ofast -Wall -Wformat=2 -DNDEBUG -UNDEBUG
+LOCAL_CFLAGS += -Wno-unused-parameter
+
+LOCAL_CPPFLAGS := -std=c++11 -fexceptions -frtti
+
+LOCAL_SHARED_LIBRARIES := \
+    libbinder \
+    libcrypto \
+    libcutils \
+    libgui \
+    libjpeg \
+    libssl \
+    libui \
+    libutils \
+    libz
+
+LOCAL_STATIC_LIBRARIES += \
+    libtigervnc
+
+LOCAL_C_INCLUDES += \
+    external/tigervnc/common
+
+LOCAL_MODULE := vncpasswd
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
diff --git a/unix/vncpasswd/vncpasswd.cxx b/unix/vncpasswd/vncpasswd.cxx
index 3055223..060a3ff 100644
--- a/unix/vncpasswd/vncpasswd.cxx
+++ b/unix/vncpasswd/vncpasswd.cxx
@@ -91,6 +91,28 @@
   return 0;
 }
 
+static int encrypt_pipe_for_password(char* plain, char* fname) {
+
+  if (!plain)
+    return 1;
+  PlainPasswd buf(256);
+  strcpy(buf.buf, plain);
+  ObfuscatedPasswd obfuscated(buf.takeBuf());
+    
+  FILE* fp = fopen(fname,"w");
+  if (!fp) {
+      fprintf(stderr,"Couldn't open %s for writing\n",fname);
+      return 1;
+  }
+  chmod(fname, S_IRUSR|S_IWUSR);
+
+  if (fwrite(obfuscated.buf, obfuscated.length, 1, fp) != 1) {
+      fprintf(stderr,"Writing to %s failed\n",fname);
+      return 1;
+  }
+  return 0;
+}
+
 static ObfuscatedPasswd* readpassword() {
   while (true) {
     PlainPasswd passwd(getpassword("Password:"));
@@ -126,11 +148,17 @@
   prog = argv[0];
 
   char* fname = 0;
-
+  fprintf(stderr, "argc = %d", argc);
   for (int i = 1; i < argc; i++) {
     if (strcmp(argv[i], "-q") == 0) { // allowed for backwards compatibility
     } else if (strncmp(argv[i], "-f", 2) == 0) {
       return encrypt_pipe();
+    } else if (strncmp(argv[i], "-g", 2) == 0) {
+      if (argc == 4) {
+        return encrypt_pipe_for_password(argv[i + 1], strDup(argv[i + 2]));
+      } else {
+          usage();
+      }
     } else if (argv[i][0] == '-') {
       usage();
     } else if (!fname) {