diff --git a/man/man7/tc-hfsc.7 b/man/man7/tc-hfsc.7
index 9a9d85af..eff8a0f0 100644
--- a/man/man7/tc-hfsc.7
+++ b/man/man7/tc-hfsc.7
@@ -1,6 +1,6 @@
-.TH HFSC 7 "31 October 2011" iproute2 Linux
-.ce 1
-\fBHIERARCHICAL FAIR SERVICE CURVE\fR
+.TH "TC\-HFSC" 7 "31 October 2011" iproute2 Linux
+.SH "NAME"
+tc-hfcs \- Hierarchical Fair Service Curve
 .
 .SH "HISTORY & INTRODUCTION"
 .
diff --git a/man/man8/ip-address.8 b/man/man8/ip-address.8
index 263b7652..971fe16c 100644
--- a/man/man8/ip-address.8
+++ b/man/man8/ip-address.8
@@ -1,6 +1,6 @@
-.TH IP\-ADDRESS 8 "20 Dec 2011" "iproute2" "Linux"
+.TH "IP\-ADDRESS" 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip address \- protocol address management
+ip-address \- protocol address management
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-addrlabel.8 b/man/man8/ip-addrlabel.8
index e0a2e334..3252bd23 100644
--- a/man/man8/ip-addrlabel.8
+++ b/man/man8/ip-addrlabel.8
@@ -1,6 +1,6 @@
 .TH IP\-ADDRLABEL 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip addrlabel \- protocol address label management
+ip-addrlabel \- protocol address label management
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-link.8 b/man/man8/ip-link.8
index 06bf6222..e1eb948b 100644
--- a/man/man8/ip-link.8
+++ b/man/man8/ip-link.8
@@ -1,6 +1,6 @@
 .TH IP\-LINK 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip link \- network device configuration
+ip-link \- network device configuration
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-maddress.8 b/man/man8/ip-maddress.8
index ce7e9993..afae5510 100644
--- a/man/man8/ip-maddress.8
+++ b/man/man8/ip-maddress.8
@@ -1,6 +1,6 @@
 .TH IP\-MADDRESS 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip maddress \- multicast addresses management
+ip-maddress \- multicast addresses management
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-monitor.8 b/man/man8/ip-monitor.8
index e730d196..d406216c 100644
--- a/man/man8/ip-monitor.8
+++ b/man/man8/ip-monitor.8
@@ -1,6 +1,6 @@
 .TH IP\-MONITOR 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip monitor and rtmon \- state monitoring
+ip-monitor and rtmon \- state monitoring
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-mroute.8 b/man/man8/ip-mroute.8
index 9a113fa5..98aab88f 100644
--- a/man/man8/ip-mroute.8
+++ b/man/man8/ip-mroute.8
@@ -1,6 +1,6 @@
 .TH IP\-MROUTE 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip mroute \- multicast routing cache management
+ip-mroute \- multicast routing cache management
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-neighbour.8 b/man/man8/ip-neighbour.8
index f4ea0dbd..cce7630d 100644
--- a/man/man8/ip-neighbour.8
+++ b/man/man8/ip-neighbour.8
@@ -1,6 +1,6 @@
 .TH IP\-NEIGHBOUR 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip neighbour \- neighbour/arp tables management.
+ip-neighbour \- neighbour/arp tables management.
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-netns.8 b/man/man8/ip-netns.8
index 43ec72a0..7fe9eb9c 100644
--- a/man/man8/ip-netns.8
+++ b/man/man8/ip-netns.8
@@ -1,6 +1,6 @@
 .TH IP\-NETNS 8 "20 Dec 2011" "iproute2" "Linux"
 .SH NAME
-ip netns \- process network namespace management
+ip-netns \- process network namespace management
 .SH SYNOPSIS
 .sp
 .ad l
diff --git a/man/man8/ip-ntable.8 b/man/man8/ip-ntable.8
index 767c2cc6..d903a170 100644
--- a/man/man8/ip-ntable.8
+++ b/man/man8/ip-ntable.8
@@ -1,6 +1,6 @@
 .TH IP\-NTABLE 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip ntable - neighbour table configuration
+ip-ntable - neighbour table configuration
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-route.8 b/man/man8/ip-route.8
index 6dd60a6a..91c1a0b4 100644
--- a/man/man8/ip-route.8
+++ b/man/man8/ip-route.8
@@ -1,6 +1,6 @@
 .TH IP\-ROUTE 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip route \- routing table management
+ip-route \- routing table management
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-rule.8 b/man/man8/ip-rule.8
index 24dd16c2..0f62a539 100644
--- a/man/man8/ip-rule.8
+++ b/man/man8/ip-rule.8
@@ -1,6 +1,6 @@
 .TH IP\-RULE 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip rule \- routing policy database management
+ip-rule \- routing policy database management
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-tunnel.8 b/man/man8/ip-tunnel.8
index beda08c1..37ba542c 100644
--- a/man/man8/ip-tunnel.8
+++ b/man/man8/ip-tunnel.8
@@ -1,6 +1,6 @@
 .TH IP\-TUNNEL 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip tunnel - tunnel configuration
+ip-tunnel - tunnel configuration
 .SH "SYNOPSIS"
 .sp
 .ad l
diff --git a/man/man8/ip-xfrm.8 b/man/man8/ip-xfrm.8
index fe03e6ae..f359773f 100644
--- a/man/man8/ip-xfrm.8
+++ b/man/man8/ip-xfrm.8
@@ -1,6 +1,6 @@
 .TH IP\-XFRM 8 "20 Dec 2011" "iproute2" "Linux"
 .SH "NAME"
-ip xfrm \- transform configuration
+ip-xfrm \- transform configuration
 .SH "SYNOPSIS"
 .sp
 .ad l