--- a/MANIFEST.in	Fri Jul 10 17:40:08 2015 +0200
+++ b/MANIFEST.in	Fri Jul 10 18:18:58 2015 +0200
@@ -6,9 +6,18 @@
 include man/cubicweb-ctl.1
 
 include doc/*.rst
+include doc/Makefile
 recursive-include doc/book *
 recursive-include doc/tools *.py
 recursive-include doc/tutorials *.rst *.py
+include doc/api/*.rst
+recursive-include doc/_themes *
+recursive-include doc/_static *
+include doc/_templates/*.html
+include doc/changes/*.rst
+recursive-include doc/dev .txt *.rst
+recursive-include doc/images *.png *.svg
+include doc/conf.py
 
 recursive-include misc *.py *.png *.display
 
@@ -25,18 +34,18 @@
 recursive-include sobjects/test/data bootstrap_cubes *.py
 recursive-include hooks/test/data bootstrap_cubes *.py
 recursive-include server/test/data bootstrap_cubes *.py source* *.conf.in *.ldif
-recursive-include devtools/test/data bootstrap_cubes *.py *.txt *.js
+recursive-include devtools/test/data bootstrap_cubes *.py *.txt *.js *.po.ref
 recursive-include web/test/data bootstrap_cubes pouet.css *.py
+recursive-include etwist/test/data *.py
 
 recursive-include web/test/jstests *.js *.html *.css *.json
 recursive-include web/test/windmill *.py
 
-recursive-include skeleton *.py *.css *.js *.po compat *.in *.tmpl
+recursive-include skeleton *.py *.css *.js *.po compat *.in *.tmpl rules
 
 prune doc/book/en/.static
 prune doc/book/fr/.static
 prune doc/html/_sources/
 prune misc/cwfs
-prune goa
-prune doc/book/en/devweb/js_api
+prune doc/js_api
 global-exclude *.pyc

--- a/debian/cubicweb-documentation.install.in	Fri Jul 10 17:40:08 2015 +0200
+++ b/debian/cubicweb-documentation.install.in	Fri Jul 10 18:18:58 2015 +0200
@@ -1,3 +1,3 @@
 ../../doc/book usr/share/doc/cubicweb-documentation
-../../doc/html usr/share/doc/cubicweb-documentation
+../../doc/_build/html usr/share/doc/cubicweb-documentation
 ../../debian/cubicweb-doc usr/share/doc-base/cubicweb-doc

--- a/debian/rules	Fri Jul 10 17:40:08 2015 +0200
+++ b/debian/rules	Fri Jul 10 18:18:58 2015 +0200
@@ -17,7 +17,7 @@
 	# documentation build is now made optional since it can break for old
 	# distributions and we don't want to block a new release of Cubicweb
 	# because of documentation issues.
-	-PYTHONPATH=$${PYTHONPATH:+$${PYTHONPATH}:}$(CURDIR)/debian/pythonpath $(MAKE) -C doc/book/en all
+	-PYTHONPATH=$${PYTHONPATH:+$${PYTHONPATH}:}$(CURDIR)/debian/pythonpath $(MAKE) -C doc all
 	rm -rf debian/pythonpath
 	touch build-stamp
 
@@ -27,6 +27,7 @@
 	rm -rf build
 	#rm -rf debian/cubicweb-*/
 	find . -name "*.pyc" -delete
+	-$(MAKE) -C doc clean
 	rm -f $(basename $(wildcard debian/*.in))
 	dh_clean
 
@@ -70,7 +71,7 @@
 	dh_installlogrotate -i
 	dh_installdocs -i -A README
 	dh_installman -i
-	dh_installchangelogs -i
+	dh_installchangelogs -i -Xdoc/changes
 	dh_link -i
 	dh_compress -i -X.py -X.ini -X.xml -X.js -X.rst -X.txt
 	dh_fixperms -i