--- a/Makefile	Thu Nov 17 22:46:48 2016 +0200
+++ b/Makefile	Thu Nov 17 23:29:31 2016 +0200
@@ -159,10 +159,10 @@
 
 HTML_FILES := $(RST_HTML_FILES) $(INDEX_HTML_FILE) $(STAT_HTML_FILE)
 
-LOGO_NAME := logo
-LOGO_SVG := $(LOGO_NAME).svg
+LOGO_FILE := www/logo.svg
 LOGO_DIM := 32x32 48x48 64x64
-LOGO_PNG_FILES := $(patsubst %,$(LOGO_NAME)-%.png,$(LOGO_DIM))
+LOGO_PNG_FILES := $(patsubst %,dist/misc/logo-%.png,$(LOGO_DIM))
+FAVICON := dist/www/favicon.ico
 
 DISTREL_TARBALLS = dist/$(fullpkgname).tar.gz dist/$(fullpkgname).zip
 DISTSRC_TARBALLS = dist/$(fullpkgname)_src.tar.gz # dist/$(fullpkgname)_src.zip
@@ -233,10 +233,10 @@
 	hg push ssh://$(DEFUN_USER)@$(DEFUN_HG_SRV)/$(DEFUN_HG_DIR) || [ $$? = 1 ]
 
 .PHONY: deploy2defun-www
-deploy2defun-www: $(HTML_FILES)
+deploy2defun-www: $(HTML_FILES) $(FAVICON)
 	( \
 echo 'cd $(DEFUN_WWW_DIR)'; \
-for f in $(HTML_FILES); do \
+for f in $(HTML_FILES) $(FAVICON); do \
   n=$${f##*/}; \
   echo "put $$f $$n"; \
   echo "chmod 644 $$n"; \
@@ -273,9 +273,9 @@
 
 # Will be accessed via http://$(pkgname).sourceforge.net
 .PHONY: deploy2sf-www
-deploy2sf-www: $(HTML_FILES)
+deploy2sf-www: $(HTML_FILES) $(FAVICON)
 	( echo 'cd htdocs'; \
-for f in $(HTML_FILES); do \
+for f in $(HTML_FILES) $(FAVICON); do \
   n=$${f##*/}; \
   echo "put $$f $$n"; \
   echo "chmod 644 $$n"; \
@@ -610,6 +610,12 @@
 ################################################################
 # Misc targets.
 
+.PHONY: favicon
+favicon: $(FAVICON)
+
+$(FAVICON): $(LOGO_FILE) $(MAKEFILE_LIST) | $(dir $(FAVICON))
+	convert +antialias $< -resize 16x16 $@
+
 .PHONY: logo
 logo: logo-png
 
@@ -618,7 +624,7 @@
 
 # Require:
 #   $ sudo apt-get install imagemagick librsvg2-bin
-$(LOGO_PNG_FILES): $(LOGO_NAME)-%.png: $(LOGO_SVG)
+$(LOGO_PNG_FILES): dist/misc/logo-%.png: $(LOGO_FILE) | dist/misc/
 	convert +antialias -background transparent $< -resize $* $@
 
 .PHONY: voa