diff --git a/Makefile.am b/Makefile.am
index 7c41c803..e588c791 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1 @@
-SUBDIRS = fko src
+SUBDIRS = fko src doc
diff --git a/autogen.sh b/autogen.sh
index d15b65ef..6556e566 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,10 +4,12 @@
 #
 # Run this script to generate all the initial makefiles, etc.
 #
+set -x
+
 aclocal -I config
 libtoolize --automake --copy --force
 autoheader
-automake --add-missing --copy --foreign
+automake --add-missing --copy
 autoconf
 
 ###EOF###
diff --git a/configure.ac b/configure.ac
index f0dcc128..41a27d66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,7 @@ AC_CHECK_FUNCS([bzero gettimeofday memmove memset setlocale strchr strdup])
 
 AC_CONFIG_FILES([Makefile
                  fko/Makefile
+                 doc/Makefile
                  src/Makefile])
 
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 00000000..9d722bd1
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,11 @@
+info_TEXINFOS           = libfko.texi
+SUFFIXES                = .html
+
+html_docs               = libfko.html
+
+.texi.html:
+	$(MAKEINFO) --html $<
+
+.PHONY: html
+html: version.texi $(html_docs)
+
diff --git a/doc/libfko.texi b/doc/libfko.texi
new file mode 100644
index 00000000..75f31f63
--- /dev/null
+++ b/doc/libfko.texi
@@ -0,0 +1,31 @@
+\input texinfo   @c -*-texinfo-*-
+@c %**start of header
+@setfilename libfko.info
+@settitle Firewall Knock Operator Library - libfko
+@setchapternewpage odd
+@c %**end of header
+@headings             double
+
+@include version.texi
+
+@dircategory Network
+@direntry
+* libfko: (libfko).    The FireWall KNock OPerator (fwknop) Library - libfko
+@end direntry
+
+@ifinfo
+This file documents the Firewall Knock Operator library.
+
+@end ifinfo
+
+@titlepage
+@sp 10
+@title libfko
+@subtitle Edition @value{EDITION}, @value{UPDATED}
+@author Damien S. Stuart
+@author @email{dstuart@@dstuart.org}
+
+@page
+@vskip 0pt plus 1filll
+@end titlepage
+