diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 68289d9947..6b73c824ef 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -9,11 +9,15 @@ Copyright (C) 2010 - 2013 Red Hat, Inc.
 <refentry id="NetworkManager.conf">
   <refentryinfo>
     <title>NetworkManager.conf</title>
+    <author>NetworkManager developers</author>
   </refentryinfo>
 
   <refmeta>
     <refentrytitle>NetworkManager.conf</refentrytitle>
     <manvolnum>5</manvolnum>
+    <refmiscinfo class="source">NetworkManager</refmiscinfo>
+    <refmiscinfo class="manual">Configuration</refmiscinfo>
+    <refmiscinfo class="version">0.9.10</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -350,9 +354,9 @@ unmanaged-devices=mac:00:22:68:1c:59:b1;mac:00:1E:65:30:D1:C4;interface-name:eth
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>NetworkManager</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>
diff --git a/man/NetworkManager.xml b/man/NetworkManager.xml
index 7b9cfa652e..da4e99ddb9 100644
--- a/man/NetworkManager.xml
+++ b/man/NetworkManager.xml
@@ -4,19 +4,22 @@
         "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
-  Copyright (C) 2005 - 2013 Red Hat, Inc.
+ Copyright (C) 2005 - 2013 Red Hat, Inc.
  Copyright (C) 2005 - 2009 Novell, Inc.
  Copyright (C) 2005 Robert Love
-
 -->
 
 <refentry id="NetworkManager">
   <refentryinfo>
     <title>NetworkManager</title>
+    <author>NetworkManager developers</author>
   </refentryinfo>
   <refmeta>
     <refentrytitle>NetworkManager</refentrytitle>
     <manvolnum>8</manvolnum>
+    <refmiscinfo class="source">NetworkManager</refmiscinfo>
+    <refmiscinfo class="manual">Network management daemons</refmiscinfo>
+    <refmiscinfo class="version">0.9.10</refmiscinfo>
   </refmeta>
 
   <refnamediv>
@@ -212,9 +215,9 @@
   <refsect1>
     <title>See Also</title>
     <para>
-      <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>NetworkManager.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nmcli</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
+      <citerefentry><refentrytitle>nm-online</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-settings</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-applet</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
       <citerefentry><refentrytitle>nm-connection-editor</refentrytitle><manvolnum>1</manvolnum></citerefentry>