diff --git a/Makefile.in b/Makefile.in
index 7472419..8467db5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,7 @@ LIBDIR=@libdir@
 INCDIR=@prefix@/include
 
 PGMS=markdown
-SAMPLE_PGMS=mkd2html
+SAMPLE_PGMS=mkd2html makepage
 @THEME@SAMPLE_PGMS+= theme
 MKDLIB=libmarkdown.a
 OBJS=mkdio.o markdown.o dumptree.o generate.o \
diff --git a/makepage.c b/makepage.c
new file mode 100644
index 0000000..c606927
--- /dev/null
+++ b/makepage.c
@@ -0,0 +1,26 @@
+/*
+ * makepage: Use mkd_xhtmlpage() to convert markdown input to a
+ *           fully-formed xhtml page.
+ */
+#include <stdio.h>
+#include <stdlib.h>
+#include <mkdio.h>
+
+main(argc, argv)
+int argc;
+char **argv;
+{
+    MMIOT *doc;
+    
+    if ( (argc > 1) && !freopen(argv[1], "r", stdin) ) {
+	perror(argv[1]);
+	exit(1);
+    }
+
+    if ( (doc = mkd_in(stdin, 0)) == 0 ) {
+	perror( (argc > 1) ? argv[1] : "stdin" );
+	exit(1);
+    }
+
+    exit(mkd_xhtmlpage(doc, 0, stdout));
+}