diff --git a/make/tex.mk b/make/tex.mk
index f75cfd7c..0ed20c44 100644
--- a/make/tex.mk
+++ b/make/tex.mk
@@ -80,31 +80,29 @@ define mangle_tmpl
 	@echo $< \-\> $@
 	@if [ $(suffix $@) = tex ];  then echo -e $(TEX_WARN_DONT_EDIT)  > $@; fi
 	@if [ $(suffix $@) = html ]; then echo -e $(HTML_WARN_DONT_EDIT) > $@; fi
-	TMPIMAGEDIR="`echo $(IMAGEDIR) | sed -e 's/\//\\\\\//g;'`" ;\
 	cat $< | sed -e "\
-		s/ä/\"a/g; \
-		s/Ä/\"A/g; \
-		s/ö/\"o/g; \
-		s/Ö/\"O/g; \
-		s/ü/\"u/g; \
-		s/Ü/\"U/g; \
-		s/ß/\"s/g; \
-	" | sed -e "\
-		s/__DATE__/$(DATE)/g; \
-		s/__AUTHORS__/$(AUTHORS)/g; \
-		s/__TITLE__/$(TITLE)/g; \
-		s/__VERSION__/$(VERSION)/g; \
-		s/__SUBTITLE__/$(SUBTITLE)/g; \
-		s/__CONFIDENTIAL_REMARK__/$(CONFIDENTIAL_REMARK)/g; \
-		s/__HEADER__/$(HEADER)/g; \
-		s/__FRONTPAGE__/$(FRONTPAGE)/g; \
-		s/__FRONTLOGO_EPS__/$$TMPIMAGEDIR\/$(FRONTLOGO_EPS)/g; \
-		s/__FRONTLOGO_WEB__/$(FRONTLOGO_WEB)/g; \
-		s/__ICON_UP__/$(ICON_UP)/g; \
-		s/__ICON_INDEX__/$(ICON_INDEX)/g; \
-		s/__ICON_CONTENTS__/$(ICON_CONTENTS)/g; \
-		s/__ICON_PREV__/$(ICON_PREV)/g; \
-		s/__ICON_NEXT__/$(ICON_NEXT)/g; \
+		s%__DATE__%$(DATE)%g; \
+		s%__AUTHORS__%$(AUTHORS)%g; \
+		s%__TITLE__%$(TITLE)%g; \
+		s%__VERSION__%$(VERSION)%g; \
+		s%__SUBTITLE__%$(SUBTITLE)%g; \
+		s%__CONFIDENTIAL_REMARK__%$(CONFIDENTIAL_REMARK)%g; \
+		s%__HEADER__%$(HEADER)%g; \
+		s%__FRONTPAGE__%$(FRONTPAGE)%g; \
+		s%__FRONTLOGO_EPS__%$(IMAGEDIR)/$(FRONTLOGO_EPS)%g; \
+		s%__FRONTLOGO_WEB__%$(FRONTLOGO_WEB)%g; \
+		s%__ICON_UP__%$(ICON_UP)%g; \
+		s%__ICON_INDEX__%$(ICON_INDEX)%g; \
+		s%__ICON_CONTENTS__%$(ICON_CONTENTS)%g; \
+		s%__ICON_PREV__%$(ICON_PREV)%g; \
+		s%__ICON_NEXT__%$(ICON_NEXT)%g; \
+		s%ä%\"a%g; \
+		s%Ä%\"A%g; \
+		s%ö%\"o%g; \
+		s%Ö%\"O%g; \
+		s%ü%\"u%g; \
+		s%Ü%\"U%g; \
+		s%ß%\"s%g; \
 	" | awk '                                              \
 		BEGIN { FS=":" } {                             \
 		if ($$0 ~ /SUBST_LINE_NUM/) {                  \
@@ -196,10 +194,15 @@ dirs: dirs.done
 arch:
 	test $(shell uname -s) = Linux
 
-#xdvi: $(LATEX_INPUT)
-#	@echo "-- running latex just once ..."
-#	$(latex) $(MAIN).tex
-#	xdvi $(MAIN).dvi
+xdvi: $(LATEX_INPUT)
+	@echo "-- running latex just once ..."
+	$(latex) $(MAIN).tex
+	xdvi $(MAIN).dvi
+
+xpdf: $(LATEX_INPUT)
+	@echo "-- running latex just once ..."
+	pdflatex $(MAIN).tex
+	acroread $(MAIN).pdf
 
 $(OUT).tex.zip: cfgtest $(LATEX_INPUT)
 	@echo "-- creating zipfile with tex source files"
@@ -271,7 +274,7 @@ html_install: $(HTMLDIR)
 clean:
 	@echo "-- cleaning up ..."
 	rm -rf *.aux *.toc *.dvi *.pdf *.ps *~ *.log *.done *.rep \
-		*.lol *.bak \
+		*.lol *.bak *.idx *.ilg *.ind *.out *.brf \
 		$(NEWDIRS) $(OUTPUT).txt \
 		$(GENERATED) \
 		$(CLEAN)