diff -urN a/conga.spec.in.in b/conga.spec.in.in
--- a/conga.spec.in.in	2010-09-27 01:18:23.000000000 -0400
+++ b/conga.spec.in.in	2010-09-27 01:25:38.000000000 -0400
@@ -142,6 +142,9 @@
 %if "%{include_zope_and_plone}" == "yes"
 				%{_libdir}/luci/zope
 %endif
+%doc
+%{_mandir}/man8/ricci.8*
+%{_mandir}/man8/luci_admin.8*
 
 %pre -n luci
 groupmod luci >&/dev/null
diff -urN a/luci/docs/luci_admin.8 b/luci/docs/luci_admin.8
--- a/luci/docs/luci_admin.8	1969-12-31 19:00:00.000000000 -0500
+++ b/luci/docs/luci_admin.8	2010-09-27 01:21:38.000000000 -0400
@@ -0,0 +1,24 @@
+.TH LUCI_ADMIN "8"
+.SH NAME
+luci_admin \- luci configuration and backup tool
+.SH SYNOPSIS
+.B luci_admin
+[\fIOPTIONS\fR]
+.SH DESCRIPTION
+.PP
+luci_admin is used to initialize a new luci installation or to manage an existing luci server. luci_admin must be used only when the luci server is not running.
+.TP
+\fBinit\fR
+Initialize the luci server. This creates luci's SSL certificates. This command must be run before starting the luci server for the first time.
+.TP
+\fBpassword\fR
+Set the password for the admin user.
+.TP
+\fBbackup\fR
+Create a backup containing the state of the luci server. Managed clusters, storage systems, local users, user permissions, and SSL certificates will be stored as part of the backup. The backup file is written to /var/lib/luci/var/luci_backup.xml.
+.TP
+\fBrestore\fR [<backup_file>]
+Restore luci's configuration using data from a luci backup. If no backup file is specified, the default location (/var/lib/luci/var/luci_backup.xml) is used.
+.TP
+\fBhelp\fR
+Print a short help dialog.
diff -urN a/luci/docs/Makefile b/luci/docs/Makefile
--- a/luci/docs/Makefile	2010-09-27 01:18:24.000000000 -0400
+++ b/luci/docs/Makefile	2010-09-27 01:33:00.000000000 -0400
@@ -8,6 +8,8 @@
 ##
 ################################################################################
 
+include ../make/defines.mk
+
 LUCI_HOST=luci
 LUCI_USER=admin
 LUCI_PASS=changeme
@@ -20,6 +22,8 @@
 docs:
 
 install:
+	install -d ${mandir}/man8
+	install luci_admin.8 ${mandir}/man8
 
 clean:
 
diff -urN a/ricci/docs/Makefile b/ricci/docs/Makefile
--- a/ricci/docs/Makefile	1969-12-31 19:00:00.000000000 -0500
+++ b/ricci/docs/Makefile	2010-09-27 01:33:50.000000000 -0400
@@ -0,0 +1,8 @@
+include ../make/defines.mk
+
+all:
+	@true
+
+install:
+	install -d ${mandir}/man8
+	install ricci.8 ${mandir}/man8
diff -urN a/ricci/Makefile b/ricci/Makefile
--- a/ricci/Makefile	2010-09-27 01:18:24.000000000 -0400
+++ b/ricci/Makefile	2010-09-27 01:21:22.000000000 -0400
@@ -33,6 +33,7 @@
 	${MAKE} -C modules install
 	${MAKE} -C init.d install
 	${MAKE} -C pam.d install
+	${MAKE} -C docs install
 	${INSTALL_DIR} ${docdir}/ricci-${VERSION}/
 	${INSTALL_FILE} COPYING ${docdir}/ricci-${VERSION}/