diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md
index b100b6bab4..8a339d07ef 100644
--- a/docs/libpod.conf.5.md
+++ b/docs/libpod.conf.5.md
@@ -1,4 +1,4 @@
-% libpod.conf "5"
+% libpod.conf(5)
 
 # NAME
 libpod.conf - libpod configuration file
diff --git a/docs/podman-attach.1.md b/docs/podman-attach.1.md
index f56bde9e1c..22ece86029 100644
--- a/docs/podman-attach.1.md
+++ b/docs/podman-attach.1.md
@@ -1,4 +1,4 @@
-% podman-attach "1"
+% podman-attach(1)
 
 ## NAME
 podman\-attach - Attach to a running container
diff --git a/docs/podman-build.1.md b/docs/podman-build.1.md
index 7e8f0c1371..c64ec91cda 100644
--- a/docs/podman-build.1.md
+++ b/docs/podman-build.1.md
@@ -1,4 +1,4 @@
-% podman-build "1"
+% podman-build(1)
 
 ## NAME
 podman\-build - Build a container image using a Dockerfile.
diff --git a/docs/podman-commit.1.md b/docs/podman-commit.1.md
index 4770eef09c..dd82c80e4f 100644
--- a/docs/podman-commit.1.md
+++ b/docs/podman-commit.1.md
@@ -1,4 +1,4 @@
-% podman-commit "1"
+% podman-commit(1)
 
 ## NAME
 podman\-commit - Create new image based on the changed container
diff --git a/docs/podman-container-cleanup.1.md b/docs/podman-container-cleanup.1.md
index 5002e71428..2819d1138a 100644
--- a/docs/podman-container-cleanup.1.md
+++ b/docs/podman-container-cleanup.1.md
@@ -1,4 +1,4 @@
-% podman-container-cleanup "1"
+% podman-container-cleanup(1)
 
 ## NAME
 podman\-container\-cleanup - Cleanup Container storage and networks
diff --git a/docs/podman-container-refresh.1.md b/docs/podman-container-refresh.1.md
index a58a653e62..494255dc7c 100644
--- a/docs/podman-container-refresh.1.md
+++ b/docs/podman-container-refresh.1.md
@@ -1,4 +1,4 @@
-% podman-container-refresh '1'
+% podman-container-refresh(1)
 
 ## NAME
 podman\-container\-refresh - Refresh all containers
diff --git a/docs/podman-container.1.md b/docs/podman-container.1.md
index 57495d3ba4..bbc325823a 100644
--- a/docs/podman-container.1.md
+++ b/docs/podman-container.1.md
@@ -1,4 +1,4 @@
-% podman-container "1"
+% podman-container(1)
 
 ## NAME
 podman\-container - Manage containers
diff --git a/docs/podman-cp.1.md b/docs/podman-cp.1.md
index 2f29a2ebc3..88e50e86b3 100644
--- a/docs/podman-cp.1.md
+++ b/docs/podman-cp.1.md
@@ -1,4 +1,4 @@
-% podman-cp "1"
+% podman-cp(1)
 
 ## NAME
 podman\-cp - Copy files/folders between a container and the local filesystem
diff --git a/docs/podman-create.1.md b/docs/podman-create.1.md
index 1866d68a4c..e7732b60fc 100644
--- a/docs/podman-create.1.md
+++ b/docs/podman-create.1.md
@@ -1,4 +1,4 @@
-% podman-create "1"
+% podman-create(1)
 
 ## NAME
 podman\-create - Create a new container
diff --git a/docs/podman-diff.1.md b/docs/podman-diff.1.md
index eae3521f5b..dd5f0edcff 100644
--- a/docs/podman-diff.1.md
+++ b/docs/podman-diff.1.md
@@ -1,4 +1,4 @@
-% podman-diff "1"
+% podman-diff(1)
 
 ## NAME
 podman\-diff - Inspect changes on a container or image's filesystem
diff --git a/docs/podman-exec.1.md b/docs/podman-exec.1.md
index 910b68339b..700d1f89a9 100644
--- a/docs/podman-exec.1.md
+++ b/docs/podman-exec.1.md
@@ -1,4 +1,4 @@
-% podman-exec "1"
+% podman-exec(1)
 
 ## NAME
 podman\-exec - Execute a command in a running container
diff --git a/docs/podman-export.1.md b/docs/podman-export.1.md
index 9adc1499ba..ff7e660bc5 100644
--- a/docs/podman-export.1.md
+++ b/docs/podman-export.1.md
@@ -1,4 +1,4 @@
-% podman-export "1"
+% podman-export(1)
 
 ## NAME
 podman\-export - Export container's filesystem contents as a tar archive
diff --git a/docs/podman-history.1.md b/docs/podman-history.1.md
index 5b911a67f8..6791c772da 100644
--- a/docs/podman-history.1.md
+++ b/docs/podman-history.1.md
@@ -1,4 +1,4 @@
-% podman-history "1"
+% podman-history(1)
 
 ## NAME
 podman\-history - Shows the history of an image
diff --git a/docs/podman-image.1.md b/docs/podman-image.1.md
index 64a798fdaf..33de0456f3 100644
--- a/docs/podman-image.1.md
+++ b/docs/podman-image.1.md
@@ -1,4 +1,4 @@
-% podman-image "1"
+% podman-image(1)
 
 ## NAME
 podman\-image - Manage images
diff --git a/docs/podman-images.1.md b/docs/podman-images.1.md
index 474226b9c6..0bd829a8ef 100644
--- a/docs/podman-images.1.md
+++ b/docs/podman-images.1.md
@@ -1,4 +1,4 @@
-% podman-images "1"
+% podman-images(1)
 
 ## NAME
 podman\-images - List images in local storage
diff --git a/docs/podman-import.1.md b/docs/podman-import.1.md
index 70b382a63f..b1176cee9a 100644
--- a/docs/podman-import.1.md
+++ b/docs/podman-import.1.md
@@ -1,4 +1,4 @@
-% podman-import "1"
+% podman-import(1)
 
 ## NAME
 podman\-import - Import a tarball and save it as a filesystem image
diff --git a/docs/podman-info.1.md b/docs/podman-info.1.md
index 89a485b945..364aaf3aae 100644
--- a/docs/podman-info.1.md
+++ b/docs/podman-info.1.md
@@ -1,4 +1,4 @@
-% podman-version "1"
+% podman-version(1)
 
 ## NAME
 podman\-info - Display system information
diff --git a/docs/podman-inspect.1.md b/docs/podman-inspect.1.md
index ef68e929c2..17fb2df604 100644
--- a/docs/podman-inspect.1.md
+++ b/docs/podman-inspect.1.md
@@ -1,4 +1,4 @@
-% podman-inspect "1"
+% podman-inspect(1)
 
 ## NAME
 podman\-inspect - Display a container or image's configuration
diff --git a/docs/podman-kill.1.md b/docs/podman-kill.1.md
index 115edc5644..79449fc57b 100644
--- a/docs/podman-kill.1.md
+++ b/docs/podman-kill.1.md
@@ -1,4 +1,4 @@
-% podman-kill "1"
+% podman-kill(1)
 
 ## NAME
 podman\-kill - Kills one or more containers with a signal
diff --git a/docs/podman-load.1.md b/docs/podman-load.1.md
index a3299508ef..753908d751 100644
--- a/docs/podman-load.1.md
+++ b/docs/podman-load.1.md
@@ -1,4 +1,4 @@
-% podman-load  "1"
+% podman-load(1)
 
 ## NAME
 podman\-load - Load an image from docker archive
diff --git a/docs/podman-login.1.md b/docs/podman-login.1.md
index d61881a8a2..e13ddfff78 100644
--- a/docs/podman-login.1.md
+++ b/docs/podman-login.1.md
@@ -1,4 +1,4 @@
-% podman-login "1"
+% podman-login(1)
 
 ## NAME
 podman\-login - Login to a container registry
diff --git a/docs/podman-logout.1.md b/docs/podman-logout.1.md
index e0c82b9ef3..f90e021020 100644
--- a/docs/podman-logout.1.md
+++ b/docs/podman-logout.1.md
@@ -1,4 +1,4 @@
-% podman-logout "1"
+% podman-logout(1)
 
 ## NAME
 podman\-logout - Logout of a container registry
diff --git a/docs/podman-logs.1.md b/docs/podman-logs.1.md
index 59fba69a1e..15bf56c003 100644
--- a/docs/podman-logs.1.md
+++ b/docs/podman-logs.1.md
@@ -1,4 +1,4 @@
-% podman-logs "1"
+% podman-logs(1)
 
 ## NAME
 podman\-logs - Fetch the logs of a container
diff --git a/docs/podman-mount.1.md b/docs/podman-mount.1.md
index 6af6180129..ccc2d386d5 100644
--- a/docs/podman-mount.1.md
+++ b/docs/podman-mount.1.md
@@ -1,4 +1,4 @@
-% podman-mount "1"
+% podman-mount(1)
 
 ## NAME
 podman\-mount - Mount the specifed working containers' root filesystem
diff --git a/docs/podman-pause.1.md b/docs/podman-pause.1.md
index e37ac343aa..b4930de8d5 100644
--- a/docs/podman-pause.1.md
+++ b/docs/podman-pause.1.md
@@ -1,4 +1,4 @@
-% podman-pause "1"
+% podman-pause(1)
 
 ## NAME
 podman\-pause - Pause one or more containers
diff --git a/docs/podman-pod-create.1.md b/docs/podman-pod-create.1.md
index 1d8ce9175d..fb0a309352 100644
--- a/docs/podman-pod-create.1.md
+++ b/docs/podman-pod-create.1.md
@@ -1,4 +1,4 @@
-% podman-pod-create "1"
+% podman-pod-create(1)
 
 ## NAME
 podman\-pod\-create - Create a new pod
diff --git a/docs/podman-pod-inspect.1.md b/docs/podman-pod-inspect.1.md
index edcd5dcef7..b8fb143ba4 100644
--- a/docs/podman-pod-inspect.1.md
+++ b/docs/podman-pod-inspect.1.md
@@ -1,4 +1,4 @@
-% podman-pod-inspect "1"
+% podman-pod-inspect(1)
 
 ## NAME
 podman\-pod\-inspect - Displays information describing a pod
diff --git a/docs/podman-pod-kill.1.md b/docs/podman-pod-kill.1.md
index 2f4d37f92f..4376c2d295 100644
--- a/docs/podman-pod-kill.1.md
+++ b/docs/podman-pod-kill.1.md
@@ -1,4 +1,4 @@
-% podman-pod-kill "1"
+% podman-pod-kill(1)
 
 ## NAME
 podman\-pod\-kill - Kills all containers in one or more pods with a signal
diff --git a/docs/podman-pod-pause.1.md b/docs/podman-pod-pause.1.md
index 56d63e2e2d..32c5b927ef 100644
--- a/docs/podman-pod-pause.1.md
+++ b/docs/podman-pod-pause.1.md
@@ -1,4 +1,4 @@
-% podman-pod-pause "1"
+% podman-pod-pause(1)
 
 ## NAME
 podman\-pod\-pause - Pause one or more pods
diff --git a/docs/podman-pod-ps.1.md b/docs/podman-pod-ps.1.md
index 1fdbe29353..41c36a749b 100644
--- a/docs/podman-pod-ps.1.md
+++ b/docs/podman-pod-ps.1.md
@@ -1,4 +1,4 @@
-% podman-pod-ps "1"
+% podman-pod-ps(1)
 
 ## NAME
 podman\-pod\-ps - Prints out information about pods
diff --git a/docs/podman-pod-restart.1.md b/docs/podman-pod-restart.1.md
index 0990cf8409..17fb4ed4c5 100644
--- a/docs/podman-pod-restart.1.md
+++ b/docs/podman-pod-restart.1.md
@@ -1,4 +1,4 @@
-% podman-pod-restart "1"
+% podman-pod-restart(1)
 
 ## NAME
 podman\-pod\-restart - Restart one or more pods
diff --git a/docs/podman-pod-rm.1.md b/docs/podman-pod-rm.1.md
index 834e0d0bb4..7a300c1524 100644
--- a/docs/podman-pod-rm.1.md
+++ b/docs/podman-pod-rm.1.md
@@ -1,4 +1,4 @@
-% podman-pod-rm "1"
+% podman-pod-rm(1)
 
 ## NAME
 podman\-pod\-rm - Remove one or more pods
diff --git a/docs/podman-pod-start.1.md b/docs/podman-pod-start.1.md
index 5d30db0123..253bb5f53a 100644
--- a/docs/podman-pod-start.1.md
+++ b/docs/podman-pod-start.1.md
@@ -1,4 +1,4 @@
-% podman-pod-start "1"
+% podman-pod-start(1)
 
 ## NAME
 podman\-pod\-start - Start one or more pods
diff --git a/docs/podman-pod-stop.1.md b/docs/podman-pod-stop.1.md
index 05e88041f1..74799273e0 100644
--- a/docs/podman-pod-stop.1.md
+++ b/docs/podman-pod-stop.1.md
@@ -1,4 +1,4 @@
-% podman-pod-stop "1"
+% podman-pod-stop(1)
 
 ## NAME
 podman\-pod\-stop - Stop one or more pods
diff --git a/docs/podman-pod-top.1.md b/docs/podman-pod-top.1.md
index 7a66b45348..3f714af205 100644
--- a/docs/podman-pod-top.1.md
+++ b/docs/podman-pod-top.1.md
@@ -1,4 +1,4 @@
-% podman-pod-top "1"
+% podman-pod-top(1)
 
 ## NAME
 podman\-pod\-top - Display the running processes of containers in a pod
diff --git a/docs/podman-pod-unpause.1.md b/docs/podman-pod-unpause.1.md
index 2c065976c6..643544ef1d 100644
--- a/docs/podman-pod-unpause.1.md
+++ b/docs/podman-pod-unpause.1.md
@@ -1,4 +1,4 @@
-% podman-pod-unpause "1"
+% podman-pod-unpause(1)
 
 ## NAME
 podman\-pod\-unpause - Unpause one or more pods
diff --git a/docs/podman-pod.1.md b/docs/podman-pod.1.md
index 56b93819d8..48327d2bfc 100644
--- a/docs/podman-pod.1.md
+++ b/docs/podman-pod.1.md
@@ -1,4 +1,4 @@
-% podman-pod "1"
+% podman-pod(1)
 
 ## NAME
 podman\-pod - Simple management tool for groups of containers, called pods.
diff --git a/docs/podman-port.1.md b/docs/podman-port.1.md
index a9fd903af5..874ea50363 100644
--- a/docs/podman-port.1.md
+++ b/docs/podman-port.1.md
@@ -1,4 +1,4 @@
-% podman-port "1"
+% podman-port(1)
 
 ## NAME
 podman\-port - List port mappings for a container
diff --git a/docs/podman-ps.1.md b/docs/podman-ps.1.md
index a8a2b8700e..03150f38bc 100644
--- a/docs/podman-ps.1.md
+++ b/docs/podman-ps.1.md
@@ -1,4 +1,4 @@
-% podman-ps "1"
+% podman-ps(1)
 
 ## NAME
 podman\-ps - Prints out information about containers
diff --git a/docs/podman-pull.1.md b/docs/podman-pull.1.md
index 0da020929e..bda7f671f0 100644
--- a/docs/podman-pull.1.md
+++ b/docs/podman-pull.1.md
@@ -1,4 +1,4 @@
-% podman-pull "1"
+% podman-pull(1)
 
 ## NAME
 podman\-pull - Pull an image from a registry
diff --git a/docs/podman-push.1.md b/docs/podman-push.1.md
index 8375f85b73..40442a98ff 100644
--- a/docs/podman-push.1.md
+++ b/docs/podman-push.1.md
@@ -1,4 +1,4 @@
-% podman-push "1"
+% podman-push(1)
 
 ## NAME
 podman\-push - Push an image from local storage to elsewhere
diff --git a/docs/podman-restart.1.md b/docs/podman-restart.1.md
index 770c4f18e4..e9c76ebb33 100644
--- a/docs/podman-restart.1.md
+++ b/docs/podman-restart.1.md
@@ -1,4 +1,4 @@
-% podman-restart "1"
+% podman-restart(1)
 
 ## NAME
 podman\-restart - Restart a container
diff --git a/docs/podman-rm.1.md b/docs/podman-rm.1.md
index 5f542906d7..27eda5cdd7 100644
--- a/docs/podman-rm.1.md
+++ b/docs/podman-rm.1.md
@@ -1,4 +1,4 @@
-% podman-rm "1"
+% podman-rm(1)
 
 ## NAME
 podman\-rm - Remove one or more containers
diff --git a/docs/podman-rmi.1.md b/docs/podman-rmi.1.md
index 0d24ac27b8..f035897eef 100644
--- a/docs/podman-rmi.1.md
+++ b/docs/podman-rmi.1.md
@@ -1,4 +1,4 @@
-% podman-rmi "1"
+% podman-rmi(1)
 
 ## NAME
 podman\-rmi - Removes one or more images
diff --git a/docs/podman-run.1.md b/docs/podman-run.1.md
index 8df8b08fe1..68dc81b7f5 100644
--- a/docs/podman-run.1.md
+++ b/docs/podman-run.1.md
@@ -1,4 +1,4 @@
-% podman-run "1"
+% podman-run(1)
 
 ## NAME
 podman\-run - Run a command in a new container
diff --git a/docs/podman-save.1.md b/docs/podman-save.1.md
index afe69539e8..773b45b209 100644
--- a/docs/podman-save.1.md
+++ b/docs/podman-save.1.md
@@ -1,4 +1,4 @@
-% podman-save "1"
+% podman-save(1)
 
 ## NAME
 podman\-save - Save an image to docker-archive or oci-archive
diff --git a/docs/podman-search.1.md b/docs/podman-search.1.md
index d5392d58c1..d716b91f43 100644
--- a/docs/podman-search.1.md
+++ b/docs/podman-search.1.md
@@ -1,4 +1,4 @@
-% podman-search "1"
+% podman-search(1)
 
 ## NAME
 podman\-search - Search a registry for an image
diff --git a/docs/podman-start.1.md b/docs/podman-start.1.md
index 8f66c3a605..cfd44ac3a0 100644
--- a/docs/podman-start.1.md
+++ b/docs/podman-start.1.md
@@ -1,4 +1,4 @@
-% podman-start "1"
+% podman-start(1)
 
 ## NAME
 podman\-start - Start one or more containers
diff --git a/docs/podman.1.md b/docs/podman.1.md
index 8b96211158..9b3abeb7dc 100644
--- a/docs/podman.1.md
+++ b/docs/podman.1.md
@@ -1,4 +1,4 @@
-% podman "1"
+% podman(1)
 
 ## NAME
 podman - Simple management tool for containers and images