diff --git a/man/html.in b/man/html.in
index d4debcc340..bc9a668c23 100755
--- a/man/html.in
+++ b/man/html.in
@@ -9,4 +9,4 @@ fi
 target="man/$1.html"
 ninja -C "@BUILD_ROOT@" "$target"
 set -x
-exec xdg-open build/"$target"
+exec xdg-open "@BUILD_ROOT@/$target"
diff --git a/man/man.in b/man/man.in
index 5700a642bd..75680b860c 100755
--- a/man/man.in
+++ b/man/man.in
@@ -6,10 +6,11 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-target=$(ninja -C "@BUILD_ROOT@" -t query man/man | grep -E -m1 "man/$1\.[0-9]$" | awk '{print $2}')
+page="$(echo "$1" | sed 's/\./\\./')"
+target=$(ninja -C "@BUILD_ROOT@" -t query man/man | grep -E -m1 "man/$page\.[0-9]$" | awk '{print $2}')
 if [ -z "$target" ]; then
     echo "Cannot find page $1"
     exit 1
 fi
 ninja -C "@BUILD_ROOT@" "$target"
-exec man build/"$target"
+exec man "@BUILD_ROOT@/$target"