diff --git a/doc/make-man.sh b/doc/make-man.sh
index b8e4f06c798fe6ccd8ba4bf2be878f51c52148c4..7bc945a8c5c30faac5c4328567e6e848899bebf4 100755
--- a/doc/make-man.sh
+++ b/doc/make-man.sh
@@ -8,34 +8,33 @@ man5='frontend'
 
 for i in 1 5 8;do
     if [ ! -d doc/man/man${i} ]; then
-       mkdir -p -m 0755 doc/man/man${i}
+       mkdir -p -m 0755 doc/man/man"${i}"
     fi
 done
 
 for i in ${man1}; do
-    lowdown -s -Tman doc/${i}.md -o doc/man/man1/${i}.1 
-    var=$(head -n1 < doc/man/man1/${i}.1)
-    var=${var/" 7 "/" 1 "}
+    lowdown -s -Tman doc/"${i}".md -o doc/man/man1/"${i}".1 
+    var=$(head -n1 < doc/man/man1/"${i}".1)
+    var=$(printf '%s' "$var" | tr '7' '1')
     var="${var} \"\" \"General Commands Manual\""
-    sed -i "s!^.TH.*!${var}!" doc/man/man1/${i}.1
-    sed -i '2,5d' doc/man/man1/${i}.1
+    sed -i "s!^.TH.*!${var}!" doc/man/man1/"${i}".1
+    sed -i '2,5d' doc/man/man1/"${i}".1
 done
 
 for i in ${man5}; do
     lowdown -s -Tman doc/${i}.md -o doc/man/man5/${i}.5 
     var=$(head -n1 < doc/man/man5/${i}.5)
-    var=${var/" 7 "/" 5 "}
-    var="${var} \"\" \"General Commands Manual\""
+    var=$(printf '%s' "$var" | tr '7' '5')
+    var="${var} \"\" \"File Formats Manual\""
     sed -i "s!^.TH.*!${var}!" doc/man/man5/${i}.5
     sed -i '2,5d' doc/man/man5/${i}.5
 done
 
 for i in ${man8}; do
-    lowdown -s -Tman doc/${i}.md -o doc/man/man8/${i}.8 
-    var=$(head -n1 < doc/man/man8/${i}.8)
-    var=${var/" 7 "/" 8 "}
-    var="${var} \"\" \"General Commands Manual\""
-    sed -i "s!^.TH.*!${var}!" doc/man/man8/${i}.8
-    sed -i '2,5d' doc/man/man8/${i}.8
+    lowdown -s -Tman doc/"${i}".md -o doc/man/man8/"${i}".8 
+    var=$(head -n1 < doc/man/man8/"${i}".8)
+    var=$(printf '%s' "$var" | tr '7' '8')
+    var="${var} \"\" \"System Administration\""
+    sed -i "s!^.TH.*!${var}!" doc/man/man8/"${i}".8
+    sed -i '2,5d' doc/man/man8/"${i}".8
 done
-