diff --git a/make/doxygen.mk b/make/doxygen.mk
index d0c33f12..9dcbea8d 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -1,15 +1,23 @@
 include $(MODDIR)/make/defs.mk
 
 # broken by IMAGEDIR in rpmbuild
-ifneq ($(DEVELOPMENT),true)
+
+ifeq ($(DEVELOPMENT),true)
+GENERATE_DOXYGEN ?= true
+endif
+
+ifneq ($(GENERATE_DOXYGEN),true)
 include $(MODDIR)/make/dummy.mk
 else
 
-UPLOAD_URL      ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)
-UNTEMPLATED      = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
+UPLOAD_URL                  ?= $(UPLOAD_URL_DEVEL_DOC)/$(PROJECT)
+UNTEMPLATED                  = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
+OUTPUT_DIR                  ?= html
+INSTALL_DOXYGEN_DIR         ?= $(DOC_PREFIX)/devel
+DOC_FILES                    = $(IMAGEDIR)/jannet_08.png
 
-all:
-install:
+all: html
+install: install.done
 distclean: clean
 clean: clean.doxygen
 doc: all
@@ -17,14 +25,13 @@ upload: upload.done
 
 html: doxygen.done cpfiles.done
 
-DOC_FILES = \
-	$(IMAGEDIR)/jannet_08.png
 
 %: %.tmpl
 	cat $< \
 		| sed "s/__VERSION__/$(VERSION)/" \
 		| sed "s/__PROJECT__/$(PROJECT)/" \
 		| sed "s/__PROJECT_CAPNAME__/$(PROJECT_CAPNAME)/" \
+		| sed "s/__OUTPUT_DIR__/$(OUTPUT_DIR)/" \
 	> $@
 
 doxygen.done: $(UNTEMPLATED)
@@ -32,20 +39,35 @@ doxygen.done: $(UNTEMPLATED)
 	touch $@
 
 cpfiles.done: doxygen.done $(DOC_FILES) 
-	cp $(DOC_FILES) html
+	cp $(DOC_FILES) $(OUTPUT_DIR)
 	touch $@
 
 doc.done: doxygen.done cpfiles.done
 	touch $@
 
 view: doc.done
-	konqueror html/index.html
+	konqueror $(OUTPUT_DIR)/index.html
 
 upload.done: doxygen.done cpfiles.done
-
-	upload.sh html $(UPLOAD_URL)
+	upload.sh $(OUTPUT_DIR) $(UPLOAD_URL)
 
 clean.doxygen:
-	rm -rf html *.done $(UNTEMPLATED)
+	rm -rf $(OUTPUT_DIR) *.done $(UNTEMPLATED)
+
+inst-dir.done:
+	$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(INSTALL_DOXYGEN_DIR)
+	touch $@
+	
+install.done: doxygen.done inst-dir.done
+	make install.doxygen
+	touch $@
+
+install.doxygen:
+	$(INSTALL) -o $(DOCOWNER) -g $(DOCGROUP) -m $(DOCMODE) \
+		$(wildcard $(OUTPUT_DIR)/*.html) \
+		$(wildcard $(OUTPUT_DIR)/*.gif) \
+		$(wildcard $(OUTPUT_DIR)/*.png) \
+		$(wildcard $(OUTPUT_DIR)/*.css) \
+		$(INSTALL_DOXYGEN_DIR)
 endif