diff --git a/man/Dockerfile.5.md b/man/Dockerfile.5.md
index 46794db87c..57fc089b29 100644
--- a/man/Dockerfile.5.md
+++ b/man/Dockerfile.5.md
@@ -1,6 +1,5 @@
-% DOCKERFILE(5) Docker User Manuals
-% Zac Dover
-% May 2014
+% "DOCKERFILE" "5" "MAY 2014" "Docker Community" "Docker User Manuals"
+
 # NAME
 
 Dockerfile - automate the steps of creating a Docker image
diff --git a/man/docker-build.1.md b/man/docker-build.1.md
index a953b43eff..0ac30bcc2f 100644
--- a/man/docker-build.1.md
+++ b/man/docker-build.1.md
@@ -1,6 +1,5 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
+% "DOCKER" "1" "JUNE 2014" "Docker Community" "Docker User Manuals"
+
 # NAME
 docker-build - Build an image from a Dockerfile
 
diff --git a/man/docker-config-json.5.md b/man/docker-config-json.5.md
index 49987f08b8..b475315676 100644
--- a/man/docker-config-json.5.md
+++ b/man/docker-config-json.5.md
@@ -1,6 +1,5 @@
-% CONFIG.JSON(5) Docker User Manuals
-% Docker Community
-% JANUARY 2016
+% "CONFIG.JSON" "5" "JANUARY 2016" "Docker Community" "Docker User Manuals"
+
 # NAME
 HOME/.docker/config.json - Default Docker configuration file
 
diff --git a/man/docker-run.1.md b/man/docker-run.1.md
index e693fdf316..4820420b90 100644
--- a/man/docker-run.1.md
+++ b/man/docker-run.1.md
@@ -1,6 +1,5 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
+% "DOCKER" "1" "JUNE 2014" "Docker Community" "Docker User Manuals"
+
 # NAME
 docker-run - Run a command in a new container
 
diff --git a/man/docker.1.md b/man/docker.1.md
index abedb45ca9..a3a19ed934 100644
--- a/man/docker.1.md
+++ b/man/docker.1.md
@@ -1,6 +1,5 @@
-% DOCKER(1) Docker User Manuals
-% William Henry
-% APRIL 2014
+% "DOCKER" "1" "APRIL 2014" "Docker Community" "Docker User Manuals"
+
 # NAME
 docker \- Docker image and container command line interface
 
diff --git a/man/dockerd.8.md b/man/dockerd.8.md
index c76c74ff19..4af47c568e 100644
--- a/man/dockerd.8.md
+++ b/man/dockerd.8.md
@@ -1,6 +1,5 @@
-% DOCKER(8) Docker User Manuals
-% Shishir Mahajan
-% SEPTEMBER 2015
+% "DOCKERD" "8" "SEPTEMBER 2015" "Docker Community" "Docker User Manuals"
+
 # NAME
 dockerd - Enable daemon mode