diff --git a/Makefile.am b/Makefile.am
index 5527dab..d302966 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -142,6 +142,7 @@ cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h
 ## Build documentation (You need Doxygen for this to work)
 webhost = http://libburn-api.pykix.org
 webpath = /
+docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
 
 docdeps = \
 	doc/doxygen.conf \
@@ -150,16 +151,27 @@ docdeps = \
 	libisofs/libisofs.h \
 	test/burniso.c
 
-doc: doc/html
+doc:	doc/html
 
 doc/html: $(docdeps)
-	$(RM) -r $@
-	doxygen doc/doxygen.conf
+	if [ -f ./doc/doc.lock ]; then \
+		$(RM) -r doc/html; \
+		doxygen doc/doxygen.conf; \
+	fi
 
 doc-upload: doc/html
 	scp -r $</* $(webhost):$(webpath)
 
-.PHONY: doc
+all: doc
+
+install-data-local: 
+	if [ -f ./doc/doc.lock ]; then \
+		$(mkinstalldirs) $(docdir)/html; \
+		$(INSTALL_DATA) doc/html/* $(docdir)/html; \
+	fi
+
+uninstall-local:
+	rm -rf $(docdir)
 
 ## ========================================================================= ##
 
diff --git a/configure.ac b/configure.ac
index f2ea614..7cfdcf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,23 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
+AC_MSG_CHECKING([if we build the HTML documentation])
+AC_ARG_ENABLE(docs,
+[  --enable-docs           Use doxygen to build HTML documentation],
+[case "${enableval}" in
+  yes) build_docs=true ;;
+  no)  build_docs=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-docs) ;;
+esac],[build_docs=false])
+
+if test "x$build_docs" = "xtrue"; then
+  AC_MSG_RESULT([yes])
+  touch doc/doc.lock
+else
+  AC_MSG_RESULT([no (use --enable-docs to enable)])
+  rm -f doc/doc.lock
+fi
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/doxygen.conf