diff --git a/ChangeLog b/ChangeLog
index 740e444d7..38679350f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2005-01-25  Elijah Newren  <newren@gmail.com>
+
+	Add man pages for metacity-window-demo and metacity-theme-viewer.
+	Man pages from Jose Moya, auto-fu from Dave Ahlswede. (#143513)
+
+	* doc/man/metacity-theme-viewer.1:
+	* doc/man/metacity-window-demo.1:
+
+	New man pages
+
+	* doc/man/Makefile.am:
+	* doc/Makefile.am:
+	* configure.in:
+
+	Make sure to install the man pages
+	
+	* doc/man/.cvsignore:
+	
+	Silence cvs
+
 2005-01-25  Benjamin Kahn  <xkahn@novell.com>
 
 	New 48x48 default icon as specified in bug #160660
diff --git a/configure.in b/configure.in
index 4683d2002..89d929f30 100644
--- a/configure.in
+++ b/configure.in
@@ -451,6 +451,7 @@ fi
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
+doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
 src/libmetacity-private.pc
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 043a12744..9738d2ffb 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,3 @@
+SUBDIRS = man 
 
 EXTRA_DIST=theme-format.txt metacity-theme.dtd dialogs.txt
diff --git a/doc/man/.cvsignore b/doc/man/.cvsignore
new file mode 100644
index 000000000..282522db0
--- /dev/null
+++ b/doc/man/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am
new file mode 100644
index 000000000..afdbf6277
--- /dev/null
+++ b/doc/man/Makefile.am
@@ -0,0 +1,3 @@
+man_MANS = metacity-theme-viewer.1 metacity-window-demo.1
+
+EXTRA_DIST = $(man_MANS)
diff --git a/doc/man/metacity-theme-viewer.1 b/doc/man/metacity-theme-viewer.1
new file mode 100644
index 000000000..72df142f6
--- /dev/null
+++ b/doc/man/metacity-theme-viewer.1
@@ -0,0 +1,43 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH METACITY-THEME-VIEWER 1 "1 June 2004" 
+.SH NAME
+metacity-theme-viewer \- view metacity themes
+.SH SYNOPSIS
+.B metacity-theme-viewer
+[
+.I THEMENAME
+]
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+.B metacity-theme-viewer
+allows you to preview any installed Metacity theme.
+.PP
+When designing a new Metacity theme, you can use
+.B metacity-theme-viewer
+to measure the performance of a window frame option, and to preview
+the option.
+.SH OPTIONS
+.TP
+.I THEMENAME
+Name of the theme to be shown (\fIAtlanta\fR by default).
+It is case-sensitive.
+.SH FILES
+.br
+.nf
+.TP
+.I /usr/share/themes
+system themes directory
+.TP
+.I /usr/share/themes/*/metacity-1/metacity-theme-1.xml
+theme specification file
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR metacity (1),
+.BR metacity-window-demo (1).
diff --git a/doc/man/metacity-window-demo.1 b/doc/man/metacity-window-demo.1
new file mode 100644
index 000000000..b7e4a852c
--- /dev/null
+++ b/doc/man/metacity-window-demo.1
@@ -0,0 +1,25 @@
+.\" In .TH, FOO should be all caps, SECTION should be 1-8, maybe w/ subsection
+.\" other parms are allowed: see man(7), man(1)
+.\"
+.\" Based on template provided by Tom Christiansen <tchrist@jhereg.perl.com>.
+.\" 
+.TH METACITY-WINDOW-DEMO 1 "1 June 2004" 
+.SH NAME
+metacity-window-demo \- demo of window features
+.SH SYNOPSIS
+.B metacity-window-demo
+.SH DESCRIPTION
+.\" Putting a newline after each sentence can generate better output.
+This program demonstrates various kinds of windows that window
+managers and window manager themes should handle.
+.PP
+Be sure to tear off the menu and toolbar, those are also a special
+kind of window.
+.SH AUTHOR
+This manual page was written by Jose M. Moya <josem@die.upm.es>, for
+the Debian  GNU/Linux system (but may be used by others).
+.SH "SEE ALSO"
+.\" Always quote multiple words for .SH
+.BR x-window-manager (1),
+.BR metacity (1),
+.BR metacity-theme-viewer (1).