diff --git a/Makefile.am b/Makefile.am
index 8b86a13..dbe3a97 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,14 +25,20 @@ doc_DATA = \
 	   README
 docdir = ${datadir}/doc/${PACKAGE}
 
-install-data-local: $(HTML_INSTALL_DATA_TARGETS)
+#install-data-local: $(HTML_INSTALL_DATA_TARGETS)
+#uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS)
 
-uninstall-local: $(HTML_UNINSTALL_DATA_TARGETS)
+install-data-local: $(DOXYGEN_INSTALL_DATA_TARGETS) sphinx-install
+
+uninstall-local: $(DOXYGEN_UNINSTALL_DATA_TARGETS)
 
 #
 # Additional rules
 #
 
+# Rules
+.PHONY: doxygen-run doxygen-doc $(DX_PS_GOAL) $(DX_PDF_GOAL)
+
 # Print out all rules
 help:
 	@echo "make targets:"; \
@@ -227,6 +233,7 @@ doxygen: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL)
 
 # Install Doxygen files
 DOCDIRS = html/doxygen man/man3
+DOXYGEN_INSTALL_DATA_TARGETS = doxygen-install
 doxygen-install:
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
 	@for dir in $(DOCDIRS) ; do \
@@ -238,14 +245,16 @@ doxygen-install:
 	done
 
 # Uninstall Doxygen files
+DOXYGEN_UNINSTALL_DATA_TARGETS = doxygen-uninstall
 doxygen-uninstall:
 	for dir in $(DOCDIRS) ; do \
 	  rm -f -r $(DESTDIR)$(docdir)/$$dir ; \
 	done
 
 @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS)
-	    rm -rf @DX_DOCDIR@
-	    $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
+	rm -rf @DX_DOCDIR@
+	$(mkinstalldirs) $(srcdir)/doc/html/doxygen
+	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
 
 DX_CLEANFILES = \
      @DX_DOCDIR@/@PACKAGE@.tag \