diff --git a/Makefile.am b/Makefile.am
index ed564744ac..826745a3eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,3 +23,5 @@
 SUBDIRS = lib examples tests doc
 
 ACLOCAL_AMFLAGS = -I m4
+
+dist_doc_DATA = README.rst
diff --git a/configure.ac b/configure.ac
index bb47bfab36..cacd0047c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,6 +146,7 @@ AC_CONFIG_FILES([
   lib/includes/Makefile
   lib/includes/spdylay/spdylayver.h
   tests/Makefile
+  tests/testdata/Makefile
   examples/Makefile
   doc/Makefile
   doc/conf.py
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6397ed7023..372a74df23 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -21,6 +21,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+EXTRA_DIST = README.rst apiref-header.rst index.rst mkapiref.py
+
 # Makefile for Sphinx documentation
 #
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d7204bcf6..429b1d4d61 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,6 +20,7 @@
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+SUBDIRS = testdata
 
 if HAVE_CUNIT
 
@@ -52,6 +53,7 @@ TESTS = main failmalloc
 
 if ENABLE_EXAMPLES
 
+EXTRA_DIST = end_to_end.py
 TESTS += end_to_end.py
 
 endif # ENABLE_EXAMPLES
diff --git a/tests/testdata/Makefile.am b/tests/testdata/Makefile.am
new file mode 100644
index 0000000000..fe236c18a7
--- /dev/null
+++ b/tests/testdata/Makefile.am
@@ -0,0 +1,23 @@
+# Spdylay - SPDY Library
+
+# Copyright (c) 2012 Tatsuhiro Tsujikawa
+
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+EXTRA_DIST = cacert.pem  index.html  privkey.pem