=== modified file 'Makefile'
--- Makefile	2019-07-15 15:19:42 +0000
+++ Makefile	2019-07-24 11:02:24 +0000
@@ -107,9 +107,9 @@
 	/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
 	$(notdir $<); \
 	if locale --all 2>/dev/null | grep --regexp='^en_US\.utf8$$' \
-	&& type man 2>/dev/null; then LANG=en_US.UTF-8 MANWIDTH=80 \
-	man --warnings --encoding=UTF-8 --local-file $(notdir $@); \
-	fi >/dev/null)
+	&& command -v man >/dev/null; then LANG=en_US.UTF-8 \
+	MANWIDTH=80 man --warnings --encoding=UTF-8 --local-file \
+	$(notdir $@); fi >/dev/null)
 
 DOCBOOKTOHTML=$(strip xsltproc --nonet --xinclude \
 	--param make.year.ranges		1 \

=== modified file 'mandos-to-cryptroot-unlock'
--- mandos-to-cryptroot-unlock	2018-08-19 14:58:40 +0000
+++ mandos-to-cryptroot-unlock	2019-07-24 11:02:24 +0000
@@ -61,7 +61,7 @@
 # Keep running plugin-runner and trying any password, until either a
 # password is accepted by cryptroot-unlock, or plugin-runner fails, or
 # the file /run/mandos-keep-running has been removed.
-while type cryptroot-unlock >/dev/null 2>&1; do
+while command -v cryptroot-unlock >/dev/null 2>&1; do
     /lib/mandos/plugin-runner > "$passfile" &
     echo $! > /run/mandos-plugin-runner.pid
     wait %% || break