diff --git a/ChangeLog b/ChangeLog
index 9229054c8b..82cc39d9de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-12-02  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Michael Biebl <biebl@teco.edu>
+	* configure.in
+	  man/NetworkManager.1.in
+	  man/NetworkManagerDispatcher.1.in
+	  man/NetworkManager.8.in
+	  man/NetworkManagerDispatcher.8.in
+		- Add .SH NAME stanzas
+		- Move NM & NM Dispatcher manpages to section 8 (admin)
+
 2006-12-02  Dan Williams  <dcbw@redhat.com>
 
 	Patch from Christian Persch <chpe@gnome.org>
diff --git a/configure.in b/configure.in
index a8f79cb3cf..27d478a3b6 100644
--- a/configure.in
+++ b/configure.in
@@ -414,8 +414,8 @@ initscript/paldo/Makefile
 initscript/paldo/NetworkManager
 initscript/paldo/NetworkManagerDispatcher
 man/Makefile
-man/NetworkManager.1
-man/NetworkManagerDispatcher.1
+man/NetworkManager.8
+man/NetworkManagerDispatcher.8
 man/nm-tool.1
 po/Makefile.in
 NetworkManager.pc
diff --git a/man/Makefile.am b/man/Makefile.am
index 1f90a5f37d..fcf9e09e99 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,10 +1,10 @@
 man_MANS =				\
-	NetworkManager.1		\
-	NetworkManagerDispatcher.1	\
+	NetworkManager.8		\
+	NetworkManagerDispatcher.8	\
 	nm-tool.1
 
 EXTRA_DIST =				\
 	$(man_MANS)			\
-	NetworkManager.1.in		\
-	NetworkManagerDispatcher.1.in	\
+	NetworkManager.8.in		\
+	NetworkManagerDispatcher.8.in	\
 	nm-tool.1.in
diff --git a/man/NetworkManager.1.in b/man/NetworkManager.8.in
similarity index 89%
rename from man/NetworkManager.1.in
rename to man/NetworkManager.8.in
index b68140d458..aa384a8cb9 100644
--- a/man/NetworkManager.1.in
+++ b/man/NetworkManager.8.in
@@ -1,8 +1,9 @@
-.\" NetworkManager(1) manual page
+.\" NetworkManager(8) manual page
 .\"
 .\" Copyright (C) 2005 Robert Love
 .\"
-.TH NETWORKMANAGER "1"
+.TH NETWORKMANAGER "8"
+.SH NAME
 NetworkManager \- network management daemon
 .SH SYNOPSIS
 .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices]
@@ -22,5 +23,5 @@ Do not daemonize.  This is useful for debugging.
 .I "--enable-test-devices"
 Enable support for virtual test devices.  These are useful for debugging.
 .SH SEE ALSO
-.BR NetworkManagerDispatcher (1),
+.BR NetworkManagerDispatcher (8),
 .BR nm-tool (1)
diff --git a/man/NetworkManagerDispatcher.1.in b/man/NetworkManagerDispatcher.8.in
similarity index 88%
rename from man/NetworkManagerDispatcher.1.in
rename to man/NetworkManagerDispatcher.8.in
index 58674455c2..d2896b8bab 100644
--- a/man/NetworkManagerDispatcher.1.in
+++ b/man/NetworkManagerDispatcher.8.in
@@ -1,8 +1,9 @@
-.\" NetworkManager(1) manual page
+.\" NetworkManager(8) manual page
 .\"
 .\" Copyright (C) 2005 Robert Love
 .\"
-.TH NETWORKMANAGERDISPATCHER "1"
+.TH NETWORKMANAGERDISPATCHER "8"
+.SH NAME
 NetworkManagerDispatcher \- daemon that runs commands in response to off/online
 .SH SYNOPSIS
 .B NetworkManagerDispatcher [\-\-no-daemon]
@@ -24,5 +25,5 @@ Do not daemonize.  This is useful for debugging.
 .SH FILES
 @sysconfdir@/NetworkManager/dispatcher.d
 .SH SEE ALSO
-.BR NetworkManager (1),
+.BR NetworkManager (8),
 .BR nm-tool (1)
diff --git a/man/nm-tool.1.in b/man/nm-tool.1.in
index 8c3e89d8b6..d98c81c394 100644
--- a/man/nm-tool.1.in
+++ b/man/nm-tool.1.in
@@ -3,6 +3,7 @@
 .\" Copyright (C) 2005 Robert Love
 .\"
 .TH NM-TOOL "1"
+.SH NAME
 nm-tool \- utility to report NetworkManager state 
 .SH SYNOPSIS
 .B nm-tool
@@ -10,5 +11,5 @@ nm-tool \- utility to report NetworkManager state
 The \fInm-tool\fP utility provides information about NetworkManager, device,
 and wireless networks.
 .SH SEE ALSO
-.BR NetworkManager (1),
-.BR NetworkManagerDispatcher (1)
+.BR NetworkManager (8),
+.BR NetworkManagerDispatcher (8)