diff --git a/lib/libutil/pw_util.c b/lib/libutil/pw_util.c
index c5327ccfbf8b..1c163d2d57ed 100644
--- a/lib/libutil/pw_util.c
+++ b/lib/libutil/pw_util.c
@@ -67,8 +67,10 @@ extern char *tempname;
 static pid_t editpid = -1;
 static int lockfd;
 static char _default_editor[] = _PATH_VI;
-char mppath[] = _PATH_PWD;
-char masterpasswd[] = _PATH_MASTERPASSWD;
+static char _default_mppath[] = _PATH_PWD;
+static char _default_masterpasswd[] = _PATH_MASTERPASSWD;
+char *mppath = _default_mppath;
+char *masterpasswd = _default_masterpasswd;
 
 void		 pw_cont(int);
 
diff --git a/usr.sbin/vipw/pw_util.c b/usr.sbin/vipw/pw_util.c
index c5327ccfbf8b..1c163d2d57ed 100644
--- a/usr.sbin/vipw/pw_util.c
+++ b/usr.sbin/vipw/pw_util.c
@@ -67,8 +67,10 @@ extern char *tempname;
 static pid_t editpid = -1;
 static int lockfd;
 static char _default_editor[] = _PATH_VI;
-char mppath[] = _PATH_PWD;
-char masterpasswd[] = _PATH_MASTERPASSWD;
+static char _default_mppath[] = _PATH_PWD;
+static char _default_masterpasswd[] = _PATH_MASTERPASSWD;
+char *mppath = _default_mppath;
+char *masterpasswd = _default_masterpasswd;
 
 void		 pw_cont(int);