diff --git a/.gitignore b/.gitignore
index 1df5d558f..e3a1e0a73 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,4 @@ test_parse_trie
 test_string_builder
 test_string_byte_reader
 c/dsls/lemon_prepared
+doc/miller.1
diff --git a/Makefile.am b/Makefile.am
index 67db4a48a..b34da5fa1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,4 +3,4 @@ AUTOMAKE_OPTIONS=dist-xz foreign
 
 EXTRA_DIST= LICENSE.txt README.md
 
-SUBDIRS=c # doc
+SUBDIRS=c doc
diff --git a/configure.ac b/configure.ac
index c25db2b87..6131ca8fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,5 +22,6 @@ AC_CONFIG_FILES([Makefile
 		c/mapping/Makefile
 		c/output/Makefile
 		c/stream/Makefile
-		c/Makefile])
+		c/Makefile
+		doc/Makefile])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 000000000..ca83c5930
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,6 @@
+man1_MANS=	miller.1
+
+MAINTAINERCLEANFILES=	miller.1
+
+miller.1:
+	a2x -d manpage -f manpage miller.1.txt