diff --git a/Makefile.am b/Makefile.am
index d3c20f6..7a2551b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ SUBDIRS = \
 	src \
 	data \
 	etc \
-	doc \
+	docs \
 	m4macros \
 	packaging
 
diff --git a/configure.ac b/configure.ac
index 7eb256e..f74a66b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -330,9 +330,9 @@ src/Makefile
 data/Makefile
 data/templates/Makefile
 etc/Makefile
-doc/Makefile
-doc/man8/Makefile
-doc/man8/tinyproxy.txt
+docs/Makefile
+docs/man8/Makefile
+docs/man8/tinyproxy.txt
 m4macros/Makefile
 packaging/Makefile
 packaging/fedora/tinyproxy.spec
diff --git a/doc/.gitignore b/docs/.gitignore
similarity index 100%
rename from doc/.gitignore
rename to docs/.gitignore
diff --git a/doc/Makefile.am b/docs/Makefile.am
similarity index 100%
rename from doc/Makefile.am
rename to docs/Makefile.am
diff --git a/doc/filter-howto.txt b/docs/filter-howto.txt
similarity index 100%
rename from doc/filter-howto.txt
rename to docs/filter-howto.txt
diff --git a/doc/http-error-codes.txt b/docs/http-error-codes.txt
similarity index 100%
rename from doc/http-error-codes.txt
rename to docs/http-error-codes.txt
diff --git a/doc/http-rfcs.txt b/docs/http-rfcs.txt
similarity index 100%
rename from doc/http-rfcs.txt
rename to docs/http-rfcs.txt
diff --git a/doc/man8/.gitignore b/docs/man8/.gitignore
similarity index 100%
rename from doc/man8/.gitignore
rename to docs/man8/.gitignore
diff --git a/doc/man8/Makefile.am b/docs/man8/Makefile.am
similarity index 100%
rename from doc/man8/Makefile.am
rename to docs/man8/Makefile.am
diff --git a/doc/man8/tinyproxy.txt.in b/docs/man8/tinyproxy.txt.in
similarity index 100%
rename from doc/man8/tinyproxy.txt.in
rename to docs/man8/tinyproxy.txt.in