diff --git a/Makefile.inc1 b/Makefile.inc1
index 527306977577..1eb8835a2d7f 100644
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -796,6 +796,10 @@ _mklocale=	usr.bin/mklocale
 _crunchgen=	usr.sbin/crunch/crunchgen
 .endif
 
+.if ${BOOTSTRAPPING} < 600020
+_pwd_mkdb=	usr.sbin/pwd_mkdb
+.endif
+
 bootstrap-tools:
 .for _tool in \
     ${_strfile} \
@@ -811,7 +815,8 @@ bootstrap-tools:
     usr.bin/rpcgen \
     usr.bin/xinstall \
     usr.sbin/config \
-    ${_crunchgen}
+    ${_crunchgen} \
+    ${_pwd_mkdb}
 	${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
 		cd ${.CURDIR}/${_tool}; \
 		${MAKE} DIRPRFX=${_tool}/ obj; \
diff --git a/etc/Makefile b/etc/Makefile
index b9604243154d..627f216f73e0 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -76,8 +76,10 @@ distribute:
 .include <bsd.endian.mk>
 .if ${TARGET_ENDIANNESS} == "1234"
 CAP_MKDB_ENDIAN= -l
+PWD_MKDB_ENDIAN= -L
 .elif ${TARGET_ENDIANNESS} == "4321"
 CAP_MKDB_ENDIAN= -b
+PWD_MKDB_ENDIAN= -B
 .else
 CAP_MKDB_ENDIAN=
 .endif
@@ -91,7 +93,8 @@ distribution:
 		${BIN2} ${DESTDIR}/etc; \
 	    ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
 		master.passwd nsmb.conf opieaccess ${DESTDIR}/etc; \
-	    pwd_mkdb -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
+	    pwd_mkdb ${PWD_MKDB_ENDIAN} -p -d ${DESTDIR}/etc \
+		${DESTDIR}/etc/master.passwd
 	cd ${.CURDIR}/bluetooth; ${MAKE} install
 	cd ${.CURDIR}/defaults; ${MAKE} install
 	cd ${.CURDIR}/periodic; ${MAKE} install