diff --git a/make/defs.mk b/make/defs.mk
index a88d70b0..c1471262 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -313,7 +313,7 @@ ALL_CSRC              += $(LOCAL_CSRC) $(PREREQ_CSRC)
 PUBLIC_PATH_DEVEL_DOC  = /proj/devel-docs
 UPLOAD_URL_DEVEL_DOC   = rsync_ssh://root@feitnix.jannet.de:/srv/www/htdocs/jannet.de_443/$(PUBLIC_PATH_DEVEL_DOC)
 
-IMAGES                += $(wildcard *.png *.jpg *.bmp *.gif *.ico)
+IMAGES                += $(wildcard *.png *.jpg *.bmp *.gif *.ico *.svg)
 
 # -- standard dirs and files for build and install
 
@@ -459,7 +459,7 @@ INSTALLED_CGI         += $(addprefix $(INSTALL_CGIDIR)/,$(EXE_CGI))
 INSTALLATION_FILE_TYPES += HTML
 BUILD_HTMLDIR          = $(TOPDIR)/htdocs
 LOCAL_HTML            += $(filter-out $(DONT_INSTALL),$(wildcard *.html *.css *.php) $(IMAGES))
-HTML_SUBDIR           ?= $(shell pwd | $(SED) 's%.*/htdocs\(/\|$$\)%%')
+HTML_SUBDIR           ?= $(shell pwd | $(SED) '/.*\/htdocs\(\/\|$$\)/!d; s%.*/htdocs\(/\|$$\)%%')
 ifeq ($(HTML_SUBDIR),)
 INSTALL_HTMLDIR        = $(PROJECT_HTMLDIR)
 else