diff --git a/UPGRADING.adoc b/UPGRADING.adoc
index d840bee5c0..c5b379c046 100644
--- a/UPGRADING.adoc
+++ b/UPGRADING.adoc
@@ -63,7 +63,9 @@ Changes from 2.8.4 to 2.8.5
- Source directory `data/html` was renamed to `data/htmlcgi` in order to better
reflect its contents and purpose, compared to documentation-oriented `html*`
directories (and recipe variable names). This may impact some packaging
- recipes which do not rely on `make install` alone. [#3049]
+ recipes which do not rely on `make install` alone. Note that more files
+ feature in the installation, e.g. a NUT logo rendition to use as favicon.
+ [#3049, #3249]
- Some fixes were applied to HTML templates for NUT CGI clients. It can be
useful for NUT deployments being upgraded to compare the files they have
diff --git a/data/htmlcgi/Makefile.am b/data/htmlcgi/Makefile.am
index 29649c404a..fa307b202b 100644
--- a/data/htmlcgi/Makefile.am
+++ b/data/htmlcgi/Makefile.am
@@ -6,7 +6,7 @@ EXTRA_DIST = README.adoc
if WITH_CGI
dist_htmlcgi_DATA = index.html bottom.html nut-banner.png
# Note: logo is not really generated, just nodist for THIS directory:
- nodist_htmlcgi_DATA = header.html $(top_srcdir)/docs/images/nut-logo.png
+ nodist_htmlcgi_DATA = header.html $(top_srcdir)/docs/images/nut-logo-60x60.png
else
EXTRA_DIST += index.html bottom.html nut-banner.png header.html.in
endif
diff --git a/data/htmlcgi/index.html b/data/htmlcgi/index.html
index eb68a2927c..56d3fb935c 100644
--- a/data/htmlcgi/index.html
+++ b/data/htmlcgi/index.html
@@ -2,7 +2,7 @@
-
+
Network UPS Tools -- https://www.networkupstools.org
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9a9c735abc..7fac198e35 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -50,7 +50,9 @@ IMAGE_FILES = \
images/asciidoc.png \
images/hostedby.png \
images/nut_layering.png \
- images/nut-logo.png \
+ images/nut-logo.svg \
+ images/nut-logo-60x60.png \
+ images/nut-logo-256x256.png \
images/note.png \
images/warning.png \
images/blue-arrow.png \
diff --git a/docs/images/nut-logo-256x256.png b/docs/images/nut-logo-256x256.png
new file mode 100644
index 0000000000..4293c946d5
Binary files /dev/null and b/docs/images/nut-logo-256x256.png differ
diff --git a/docs/images/nut-logo.png b/docs/images/nut-logo-60x60.png
similarity index 100%
rename from docs/images/nut-logo.png
rename to docs/images/nut-logo-60x60.png
diff --git a/docs/images/nut.svg b/docs/images/nut-logo-original-A4.svg
similarity index 100%
rename from docs/images/nut.svg
rename to docs/images/nut-logo-original-A4.svg
diff --git a/docs/images/nut-squared.svg b/docs/images/nut-logo.svg
similarity index 100%
rename from docs/images/nut-squared.svg
rename to docs/images/nut-logo.svg
diff --git a/docs/nut.dict b/docs/nut.dict
index 8875a29277..0e074861bd 100644
--- a/docs/nut.dict
+++ b/docs/nut.dict
@@ -1,4 +1,4 @@
-personal_ws-1.1 en 3727 utf-8
+personal_ws-1.1 en 3728 utf-8
AAC
AAS
ABI
@@ -2143,6 +2143,7 @@ failover
fallthrough
fasttrack
fatalx
+favicon
fbbf
fc
fcb