diff --git a/ChangeLog b/ChangeLog
index 81550b2047..9289075518 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-01  Robert Love  <rml@novell.com>
+
+	* configure.in, man/nm-tool.1.in, man/Makefile.am: Add nm-tool(1)
+	  manpage.
+
 2006-01-31  Dan Williams  <dcbw@redhat.com>
 
 	* nm-applet.desktop
diff --git a/configure.in b/configure.in
index a643e3d3d3..b1f102d805 100644
--- a/configure.in
+++ b/configure.in
@@ -330,6 +330,7 @@ initscript/SUSE/networkmanager-dispatcher
 man/Makefile
 man/NetworkManager.1
 man/NetworkManagerDispatcher.1
+man/nm-tool.1
 po/Makefile.in
 NetworkManager.pc
 ])
diff --git a/man/Makefile.am b/man/Makefile.am
index 1c2d6d1b03..1f90a5f37d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,8 +1,10 @@
 man_MANS =				\
 	NetworkManager.1		\
-	NetworkManagerDispatcher.1
+	NetworkManagerDispatcher.1	\
+	nm-tool.1
 
 EXTRA_DIST =				\
 	$(man_MANS)			\
 	NetworkManager.1.in		\
-	NetworkManagerDispatcher.1.in
+	NetworkManagerDispatcher.1.in	\
+	nm-tool.1.in
diff --git a/man/NetworkManager.1.in b/man/NetworkManager.1.in
index 1583236bf0..b68140d458 100644
--- a/man/NetworkManager.1.in
+++ b/man/NetworkManager.1.in
@@ -22,4 +22,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 (1),
+.BR nm-tool (1)
diff --git a/man/NetworkManagerDispatcher.1.in b/man/NetworkManagerDispatcher.1.in
index 1dbeaf96d0..58674455c2 100644
--- a/man/NetworkManagerDispatcher.1.in
+++ b/man/NetworkManagerDispatcher.1.in
@@ -24,4 +24,5 @@ Do not daemonize.  This is useful for debugging.
 .SH FILES
 @sysconfdir@/NetworkManager/dispatcher.d
 .SH SEE ALSO
-.BR NetworkManager (1)
+.BR NetworkManager (1),
+.BR nm-tool (1)
diff --git a/man/nm-tool.1.in b/man/nm-tool.1.in
new file mode 100644
index 0000000000..8c3e89d8b6
--- /dev/null
+++ b/man/nm-tool.1.in
@@ -0,0 +1,14 @@
+.\" nm-tool(1) manual page
+.\"
+.\" Copyright (C) 2005 Robert Love
+.\"
+.TH NM-TOOL "1"
+nm-tool \- utility to report NetworkManager state 
+.SH SYNOPSIS
+.B nm-tool
+.SH DESCRIPTION
+The \fInm-tool\fP utility provides information about NetworkManager, device,
+and wireless networks.
+.SH SEE ALSO
+.BR NetworkManager (1),
+.BR NetworkManagerDispatcher (1)