diff --git a/make/doxygen.mk b/make/doxygen.mk
index a508f664..eedd793b 100644
--- a/make/doxygen.mk
+++ b/make/doxygen.mk
@@ -1,13 +1,11 @@
 include $(JWBDIR)/make/defs.mk
 
-# broken by IMAGEDIR in rpmbuild
-
 ifeq ($(DEVELOPMENT),true)
-GENERATE_DOXYGEN            ?= true
+  GENERATE_DOXYGEN          ?= true
 endif
 
 ifneq ($(GENERATE_DOXYGEN),true)
-include $(JWBDIR)/make/dummy.mk
+  include $(JWBDIR)/make/dummy.mk
 else
 
 UPLOAD_FILE_MODE            ?= 644
@@ -42,30 +40,30 @@ all: html
 install: install.done
 distclean: clean
 clean: clean.doxygen
+
 doc: all
 upload: upload.done
-
 html: doxygen.done cpfiles.done
 
+view: doc.done
+	$(DX_BROWSER) $(DX_OUTPUT_DIR)/index.html
+
 doxygen.done: $(DX_UNTEMPLATED) $(DX_INCLUDE)
-	umask 022; doxygen $(DX_DOXYGEN_CONF)
+	umask 0022 && doxygen $(DX_DOXYGEN_CONF)
 	touch $@
 
 cpfiles.done: doxygen.done $(DX_DOC_FILES)
-	umask 022; cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR)
+	umask 0022 && cp $(DX_DOC_FILES) $(DX_OUTPUT_DIR)
 	touch $@
 
 doc.done: doxygen.done cpfiles.done
 	touch $@
 
-view: doc.done
-	$(DX_BROWSER) $(DX_OUTPUT_DIR)/index.html
-
 upload.done: doxygen.done cpfiles.done
 	upload.sh $(DX_OUTPUT_DIR)/ $(UPLOAD_URL)
 
 clean.doxygen:
-	$(RM) -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED) $(DX_INCLUDE) *.bak default-* doxygen.conf
+	$(RM) -rf $(DX_OUTPUT_DIR) *.done $(DX_UNTEMPLATED) $(DX_INCLUDE) *.bak default-* doxygen.conf *.tmp
 
 inst-dir.done:
 	$(INSTALL) -d -o $(DOCDIROWNER) -g $(DOCDIRGROUP) -m $(DOCDIRMODE) $(DX_INSTALL_DIR)
@@ -101,7 +99,8 @@ $(DX_DOXYGEN_CONF): $(firstword $(wildcard $(DX_DOXYGEN_CONF).tmpl $(DX_FALLBACK
 		s%__EXTRACT_STATIC__%$(DX_EXTRACT_STATIC)%g; \
 		s%__INLINE_SOURCES__%$(DX_INLINE_SOURCES)%g; \
 		s%__SOURCE_BROWSER__%$(DX_SOURCE_BROWSER)%g; \
-	" $< > $@
+	" $< > $@.tmp
+	mv $@.tmp $@
 
 doxygen-default-includes.done: $(DX_DOXYGEN_CONF)
 	doxygen -w html $(addprefix default-,$(DX_INCLUDE)) $<