diff --git a/MasterPassword/C/build b/MasterPassword/C/build
index ad543433..7065cec5 100755
--- a/MasterPassword/C/build
+++ b/MasterPassword/C/build
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
 # Run with -DDEBUG to enable trace-level output.
 
 [[ -e lib/scrypt/scryptenc.o ]] || { echo >&2 "Missing scrypt.  First get and build the scrypt source in lib/scrypt from <$(<lib/scrypt/.source)>.\n"; exit 1; }
diff --git a/MasterPassword/C/masterpassword-cli-freebsd.zip b/MasterPassword/C/masterpassword-cli-freebsd.zip
new file mode 100644
index 00000000..37b4435e
Binary files /dev/null and b/MasterPassword/C/masterpassword-cli-freebsd.zip differ
diff --git a/MasterPassword/C/mpw.bashrc b/MasterPassword/C/mpw.bashrc
index 11543332..98edc18f 100644
--- a/MasterPassword/C/mpw.bashrc
+++ b/MasterPassword/C/mpw.bashrc
@@ -7,7 +7,7 @@ mpw() {
         elif hash xclip 2>/dev/null; then
             xclip
         else
-            cat
+            cat; echo 2>/dev/null
             return
         fi
         echo >&2 "Copied!"
@@ -17,7 +17,7 @@ mpw() {
     :| _copy 2>/dev/null
 
     # Ask for the user's name and password if not yet known.
-    MP_USERNAME=${MP_USERNAME:-$(ask -s 'Your Full Name:')}
+    MP_USERNAME=${MP_USERNAME:-$(ask 'Your Full Name:')}
 
     # Start Master Password and copy the output.
     printf %s "$(MP_USERNAME=$MP_USERNAME command mpw "$@")" | _copy
diff --git a/MasterPassword/C/mpw.c b/MasterPassword/C/mpw.c
index 795153b8..d0ebbeee 100644
--- a/MasterPassword/C/mpw.c
+++ b/MasterPassword/C/mpw.c
@@ -1,3 +1,4 @@
+#define _WITH_GETLINE
 #include <stdio.h>
 #include <sys/ioctl.h>
 #include <sys/types.h>
@@ -13,7 +14,7 @@
 #include <unistd.h>
 #include <math.h>
 #include <pwd.h>
-#include <uuid/uuid.h>
+#include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>