diff --git a/Makefile.am b/Makefile.am
index c5c2874d..541bde0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4/
 
-SUBDIRS = src pixmaps po help
+SUBDIRS = src pixmaps man po help
 
 EXTRA_DIST = @PACKAGE@.spec COPYING-DOCS xmldocs.make omf.make \
 	intltool-extract.in intltool-merge.in intltool-update.in
diff --git a/configure.ac b/configure.ac
index b9a47ab8..83b0bde2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_OUTPUT(Makefile
           src/virtManager/Makefile
           src/vncViewer/Makefile
           src/graphWidgets/Makefile
+          man/Makefile
           virt-manager.spec
 	  help/Makefile
 	  help/virt-manager/Makefile
diff --git a/man/Makefile.am b/man/Makefile.am
new file mode 100644
index 00000000..820a84af
--- /dev/null
+++ b/man/Makefile.am
@@ -0,0 +1,9 @@
+
+man_MANS = virt-manager.1
+
+EXTRA_DIST = virt-manager.pod
+
+%.1: %.pod
+	pod2man $< > $@
+
+CLEANFILES = virt-manager.1
diff --git a/man/virt-manager.pod b/man/virt-manager.pod
new file mode 100644
index 00000000..80c97c05
--- /dev/null
+++ b/man/virt-manager.pod
@@ -0,0 +1,82 @@
+
+=head1 NAME
+
+virt-manager - display the virtual machine desktop management tool
+
+=head1 SYNOPSIS
+
+B<virt-viewer> [OPTIONS]
+
+=head1 DESCRIPTION
+
+B<virt-manager> is a desktop tool for managing virtual machines. It
+provides the ability to control the lifecycle of existing machines 
+(bootup/shutdown,pause/resume,suspend/restore), provision new virtual
+machines, manage virtual networks, access the graphical console of
+virtual machines, and view performance statistics.
+
+=head1 OPTIONS
+
+The following options are accepted when running C<virt-manager>:
+
+=over 4
+
+=item -h, -help
+
+Display command line help summary
+
+=item -c URI, --connect=URI
+
+Specify the hypervisor connection URI
+
+=item --no-dbus
+
+Disable the DBus API used for remote control of the C<virt-manager> UI
+
+=item --show-domain-creator
+
+Display the wizard for creating new virtual machines
+
+=item --show-domain-editor=UUID
+
+Display the dialog for editing properties of the virtual machine with
+unique ID matching C<UUID>
+
+=item --show-domain-performance=UUID
+
+Display the dialog for monitoring performance of the virtual machine with
+unique ID matching C<UUID>
+
+=item --show-domain-console=UUID
+
+Display the virtual console of the virtual machine with
+unique ID matching C<UUID>
+
+=item --show-host-summary
+
+Display the main window summarizing performance for all virtual machines
+on the host.
+
+=back
+
+=head1 AUTHOR
+
+Writen by Daniel P. Berrange.
+
+=head1 BUGS
+
+Report bugs to the mailing list C<http://www.redhat.com/mailman/listinfo/et-mgmt-tools>
+
+=head1 COPYRIGHT
+
+Copright (C) 2006-2007 Red Hat, Inc, and various contributors.
+This is free software. You may redistribute copies of it under the terms of the GNU General
+Public License C<http://www.gnu.org/licenses/gpl.html>. There is NO WARRANTY, to the extent
+permitted by law.
+
+=head1 SEE ALSO
+
+C<virsh(1)>, C<virt-viewer(1)>, the project website C<http://virt-manager.org>
+
+=cut
+
diff --git a/virt-manager.spec.in b/virt-manager.spec.in
index 7120aa1e..e383d9b4 100644
--- a/virt-manager.spec.in
+++ b/virt-manager.spec.in
@@ -139,6 +139,8 @@ fi
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/dbus-1/services/%{name}.service
 
+%{_datadir}/man/man1/%{name}.1*
+
 %changelog
 * Mon Apr 16 2007 Daniel P. Berrange <berrange@redhat.com> - 0.4.0-1
 - Support for managing virtual networks