diff --git a/libexec/portzap/scripts/setup-user b/libexec/portzap/scripts/setup-user
index b3cf684..f1f3c21 100755
--- a/libexec/portzap/scripts/setup-user
+++ b/libexec/portzap/scripts/setup-user
@@ -21,7 +21,7 @@ else
        -n "${user}" \
        -c "portzap user" \
        -m \
+       -M $("${libexec}"/scripts/get-default-umask) \
        -s /sbin/nologin
-    chmod u=rwX,g=rX,o= /home/"${user}"/
     printok "${user} user created"
 fi
diff --git a/share/portzap/CHANGELOG b/share/portzap/CHANGELOG
index a0255d5..552f4c2 100644
--- a/share/portzap/CHANGELOG
+++ b/share/portzap/CHANGELOG
@@ -1,5 +1,12 @@
 # -*- mode: org -*-
 
+* vNEXT
+
+**** Replace chmod with -M switch
+This change replaces chmod with the -M switch. The -M switch
+is given to the ~pw useradd~ command in the ~setup-user~
+script
+
 * v1.2.0
 
 **** Change default clone url