diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5f161a96..db8a1a21 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -53,7 +53,7 @@ defs.inc: defsincdate Makefile mkdefsinc
 	    $(info_TEXINFOS) $(gpgme_TEXINFOS) >$@
 
 
-online: gpgme.html gpgme.pdf gpgme-python-howto.html gpgme-python-howto.pdf
+online: gpgme.html gpgme.pdf
 	set -e; \
 	echo "Uploading current manuals to www.gnupg.org ..."; \
         user=werner ; \
diff --git a/lang/python/MANIFEST.in b/lang/python/MANIFEST.in
index bd7462a5..f4def417 100644
--- a/lang/python/MANIFEST.in
+++ b/lang/python/MANIFEST.in
@@ -1,7 +1,8 @@
-recursive-include docs *.org *.texi *.info *.rst
-recursive-include docs src *.org
-recursive-include docs rst *.rst
-recursive-include docs texinfo *.texi *.infok
+recursive-include doc *.org
+recursive-include doc *.rst
+recursive-include doc *.tex
+recursive-include doc *.texi
+recursive-include doc *.info
 recursive-include examples *.py *.pyx
 include README README.org
 include gpgme.i
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
index 86453054..6df17ceb 100644
--- a/lang/python/Makefile.am
+++ b/lang/python/Makefile.am
@@ -22,12 +22,9 @@ EXTRA_DIST = \
 	gpgme.i \
 	helpers.c helpers.h private.h \
 	examples \
-	docs \
+	doc \
 	src
 
-dist-hook:
-        cp -pr "$(srcdir)/docs" "$(DESTDIR)/docs"
-
 SUBDIRS = . tests
 
 .PHONY: prepare
diff --git a/lang/python/docs/README b/lang/python/doc/README
similarity index 100%
rename from lang/python/docs/README
rename to lang/python/doc/README
diff --git a/lang/python/docs/meta/TODO.org b/lang/python/doc/meta/TODO.org
similarity index 100%
rename from lang/python/docs/meta/TODO.org
rename to lang/python/doc/meta/TODO.org
diff --git a/lang/python/docs/meta/old-commits.log b/lang/python/doc/meta/old-commits.log
similarity index 100%
rename from lang/python/docs/meta/old-commits.log
rename to lang/python/doc/meta/old-commits.log
diff --git a/lang/python/docs/rst/gpgme-python-howto.rst b/lang/python/doc/rst/gpgme-python-howto.rst
similarity index 100%
rename from lang/python/docs/rst/gpgme-python-howto.rst
rename to lang/python/doc/rst/gpgme-python-howto.rst
diff --git a/lang/python/docs/rst/short-history.rst b/lang/python/doc/rst/short-history.rst
similarity index 100%
rename from lang/python/docs/rst/short-history.rst
rename to lang/python/doc/rst/short-history.rst
diff --git a/lang/python/docs/src/gpgme-python-howto.org b/lang/python/doc/src/gpgme-python-howto.org
similarity index 100%
rename from lang/python/docs/src/gpgme-python-howto.org
rename to lang/python/doc/src/gpgme-python-howto.org
diff --git a/lang/python/docs/src/short-history.org b/lang/python/doc/src/short-history.org
similarity index 100%
rename from lang/python/docs/src/short-history.org
rename to lang/python/doc/src/short-history.org
diff --git a/lang/python/docs/texinfo/gpgme-python-howto.texi b/lang/python/doc/texinfo/gpgme-python-howto.texi
similarity index 100%
rename from lang/python/docs/texinfo/gpgme-python-howto.texi
rename to lang/python/doc/texinfo/gpgme-python-howto.texi
diff --git a/lang/python/docs/texinfo/short-history.texi b/lang/python/doc/texinfo/short-history.texi
similarity index 100%
rename from lang/python/docs/texinfo/short-history.texi
rename to lang/python/doc/texinfo/short-history.texi
diff --git a/lang/python/docs/texinfo/texinfo.tex b/lang/python/doc/texinfo/texinfo.tex
similarity index 100%
rename from lang/python/docs/texinfo/texinfo.tex
rename to lang/python/doc/texinfo/texinfo.tex