diff --git a/Makefile.am b/Makefile.am
index f6433d5..fa53f21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,8 @@ MAINTAINERCLEANFILES = \
 
 EXTRA_DIST = easy-rsa
 
+SUBDIRS = doc
+
 dist_doc_DATA = \
 	COPYRIGHT.GPL \
 	COPYING
diff --git a/configure.ac b/configure.ac
index f9625e5..1e52ece 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,5 +47,6 @@ AC_SUBST([easyrsadir])
 
 AC_CONFIG_FILES([
 	Makefile
+	doc/Makefile
 ])
 AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..de183c6
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,16 @@
+#
+#  Easy-RSA -- This is a small RSA key management package, based on the openssl
+#              command line tool, that can be found in the easy-rsa subdirectory
+#              of the OpenVPN distribution.  While this tool is primary concerned
+#              with key management for the SSL VPN application space, it can also
+#              be used for building web certificates.
+#
+#  Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+#  Copyright (C) 2006-2012 Alon Bar-Lev <alon.barlev@gmail.com>
+#
+
+MAINTAINERCLEANFILES = \
+	$(srcdir)/Makefile.in
+
+dist_doc_DATA = README-2.0
+dist_noinst_DATA = README-1.0
diff --git a/easy-rsa/1.0/README b/doc/README-1.0
similarity index 100%
rename from easy-rsa/1.0/README
rename to doc/README-1.0
diff --git a/easy-rsa/2.0/README b/doc/README-2.0
similarity index 100%
rename from easy-rsa/2.0/README
rename to doc/README-2.0