--- Makefile.am
+++ Makefile.am
@@ -8,6 +8,6 @@
 
 bin_SCRIPTS = caca-config
 
-doc_DATA = README BUGS TODO AUTHORS NEWS NOTES THANKS
-docdir = $(datadir)/doc/libcaca-dev
+# doc_DATA = README BUGS TODO AUTHORS NEWS NOTES THANKS
+# docdir = $(datadir)/doc/libcaca-dev
 
--- doc/Makefile.am
+++ doc/Makefile.am
@@ -6,10 +6,10 @@
 
 if BUILD_DOCUMENTATION
 htmldoc_DATA = html/doxygen.css
-htmldocdir = $(datadir)/doc/libcaca-dev/html
+htmldocdir = $(datadir)/doc/packages/libcaca-devel/html
 if USE_LATEX
 psdoc_DATA = latex/libcaca.ps
-psdocdir = $(datadir)/doc/libcaca-dev/ps
+psdocdir = $(datadir)/doc/packages/libcaca-devel/ps
 endif
 endif
 
@@ -41,9 +41,9 @@
 
 install-data-local:
 if BUILD_DOCUMENTATION
-	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/doc/packages/libcaca-devel/html
 	cp `find html -name '*.html' -o -name '*.gif' -o -name '*.png'` \
-	  $(DESTDIR)$(datadir)/doc/libcaca-dev/html
+	  $(DESTDIR)$(datadir)/doc/packages/libcaca-devel/html
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
 	rm -f $(DESTDIR)$(mandir)/man1/cacaball.1
 	ln -s cacademo.1 $(DESTDIR)$(mandir)/man1/cacaball.1