diff --git a/winsup/doc/etc.postinstall.cygwin-doc.sh b/winsup/doc/etc.postinstall.cygwin-doc.sh
index 935bd94e1..de7d9e0c3 100755
--- a/winsup/doc/etc.postinstall.cygwin-doc.sh
+++ b/winsup/doc/etc.postinstall.cygwin-doc.sh
@@ -10,9 +10,9 @@
 
 doc=/usr/share/doc/cygwin-doc
 site=https://cygwin.com
-cygp=/bin/cygpath
-mks=/bin/mkshortcut
-launch=/bin/cygstart
+cygp=/usr/bin/cygpath
+mks=/usr/bin/mkshortcut
+launch=/usr/bin/cygstart
 
 html=$doc/html
 
@@ -29,7 +29,7 @@ done
 # check for programs
 for p in $cygp $mks $launch
 do
-	if [ ! -x $p ]
+	if [ ! -x "$p" ]
 	then
 		echo "Can't find program '$p'"
 		exit 2
@@ -52,7 +52,7 @@ fi
 # create User Guide and API PDF and HTML shortcuts
 while read target name desc
 do
-	[ -r $target ] && $mks $CYGWINFORALL -P -n "Cygwin/$name" -d "$desc" -- $target
+	[ -r "$target" ] && $mks $CYGWINFORALL -P -n "Cygwin/$name" -d "$desc" -- $target
 done <<EOF
 $doc/cygwin-ug-net.pdf		User\ Guide\ \(PDF\)  Cygwin\ User\ Guide\ PDF
 $html/cygwin-ug-net/index.html	User\ Guide\ \(HTML\) Cygwin\ User\ Guide\ HTML
diff --git a/winsup/doc/etc.preremove.cygwin-doc.sh b/winsup/doc/etc.preremove.cygwin-doc.sh
index 09e0c9efc..5e47eb579 100755
--- a/winsup/doc/etc.preremove.cygwin-doc.sh
+++ b/winsup/doc/etc.preremove.cygwin-doc.sh
@@ -9,7 +9,8 @@
 # exits quietly if directory does not exist as presumably no shortcuts desired
 
 doc=/usr/share/doc/cygwin-doc
-cygp=/bin/cygpath
+site=https://cygwin.com
+cygp=/usr/bin/cygpath
 rm=/bin/rm
 
 html=$doc/html
@@ -17,7 +18,7 @@ html=$doc/html
 # check for programs
 for p in $cygp $rm
 do
-	if [ ! -x $p ]
+	if [ ! -x "$p" ]
 	then
 		echo "Can't find program '$p'"
 		exit 2