47 files changed, 654 insertions, 897 deletions

diff --git a/bin/build-web-site b/bin/build-web-site
index cbfc8c3..3b5e4a9 100755
--- a/bin/build-web-site
+++ b/bin/build-web-site
@@ -18,7 +18,7 @@ umask 022
 
 prefix='/home/plugins'
 
-export PATH="$prefix/libexec:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+export PATH="$prefix/libexec:$prefix/opt/poole:$prefix/opt/poole/env/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
 
 myself=${0##*/}
 man_source_dir="$prefix/web/work/man"
@@ -54,9 +54,8 @@ ln -s "$output_dir" "$site_work_dir/output"
 # See http://pythonhosted.org/Markdown/extensions/ for documentation on the
 # extensions.
 #
-poole --build                   \
+poole.py --build                \
     --md-ext='extra'            \
-    --md-ext='headerid'         \
     --md-ext='toc'              \
     --md-ext='wikilinks'        \
     "$site_work_dir"
diff --git a/bin/check-mirrors b/bin/check-mirrors
index 446e2fd..168104f 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -13,17 +13,15 @@
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 mirrors='
-    ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/
-    ftp://ftp.lysator.liu.se/pub/monitoring-plugins/
-    ftp://ftp.belnet.be/mirror/nagios-plugins.org/
-    ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
-    ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
-    ftp://ftp.osuosl.org/pub/monitoring-plugins/
-    ftp://mirror.bytemark.co.uk/monitoring-plugins/
-    ftp://mirror.is.co.za/mirror/monitoring-plugins.org/
-    ftp://mirror.webtastix.net/monitoring-plugins/
-    ftp://mirror.mephi.ru/nagios-plugins/
-    ftp://ftp.kaist.ac.kr/nagios-plugins/
+    https://ftp.fu-berlin.de/unix/network/monitoring-plugins/
+    https://ftp.lysator.liu.se/pub/monitoring-plugins/
+    https://ftp.belnet.be/mirror/nagios-plugins.org/
+    https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
+    https://mirrors.fe.up.pt/pub/monitoring-plugins/
+    https://ftp2.osuosl.org/pub/monitoring-plugins/
+    http://mirror.mephi.ru/nagios-plugins/
+    https://ftp.kaist.ac.kr/nagios-plugins/
+    https://mirrors.ustc.edu.cn/monitoring-plugins/
 '
 
 #
@@ -33,6 +31,8 @@ mirrors='
 #
 #   URLs:
 #   - ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/
+#   - http://ftp.fu-berlin.de/unix/network/monitoring-plugins/
+#   - https://ftp.fu-berlin.de/unix/network/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -71,7 +71,8 @@ mirrors='
 #
 #   URLs:
 #   - ftp://ftp.belnet.be/mirror/nagios-plugins.org/
-#   - http://ftp.belnet.be/nagios-plugins.org/
+#   - http://ftp.belnet.be/mirror/nagios-plugins.org/
+#   - https://ftp.belnet.be/mirror/nagios-plugins.org/
 #
 #   Features:
 #   - IPv4
@@ -89,9 +90,11 @@ mirrors='
 #   URLs:
 #   - ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
 #   - http://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
+#   - https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
+#   - IPv6
 #   - Updated daily
 #
 #   Contacts:
@@ -106,6 +109,7 @@ mirrors='
 #   URLs:
 #   - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
 #   - http://mirrors.fe.up.pt/pub/monitoring-plugins/
+#   - https://mirrors.fe.up.pt/pub/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -122,8 +126,8 @@ mirrors='
 # UNITED STATES
 #
 #   URLs:
-#   - ftp://ftp.osuosl.org/pub/monitoring-plugins/
-#   - http://ftp.osuosl.org/pub/monitoring-plugins/
+#   - http://ftp2.osuosl.org/pub/monitoring-plugins/
+#   - https://ftp2.osuosl.org/pub/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -137,58 +141,6 @@ mirrors='
 #   - http://osuosl.org/
 #
 #
-# UNITED KINGDOM
-#
-#   URLs:
-#   - ftp://mirror.bytemark.co.uk/monitoring-plugins/
-#   - http://mirror.bytemark.co.uk/monitoring-plugins/
-#   - rsync://mirror.bytemark.co.uk/monitoring-plugins/ (currently not available)
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated twice a day
-#
-#   Contacts:
-#   - James Lawrie <support AT support.bytemark.co.uk>
-#
-#   Home page:
-#   - http://www.bytemark.co.uk/
-#
-# SOUTH AFRICA
-#
-#   URLs:
-#   - ftp://mirror.is.co.za/mirror/monitoring-plugins.org/
-#   - http://mirror.is.co.za/mirror/monitoring-plugins.org/
-#   - rsync://mirror.is.co.za/mirror/monitoring-plugins.org/
-#
-#   Features:
-#   - IPv4
-#   - Updated twice a day
-#
-#   Contacts:
-#   - Henti Smith <ftpadmin AT is.co.za>
-#
-#   Home page:
-#   - http://www.is.co.za/
-#
-# NEW ZEALAND
-#
-#   URLs:
-#   - ftp://mirror.webtastix.net/monitoring-plugins/
-#   - http://mirror.webtastix.net/monitoring-plugins/
-#
-#   Features:
-#   - IPv4
-#   - Updated hourly
-#
-#   Contacts:
-#   - Mirror Admins <mirrors AT webtastix.net>
-#   - Shane Langley <shane AT webtastix.net>
-#
-#   Home page:
-#   - http://www.webtastix.net/
-#
 # RUSSIA
 #
 #   URLs:
@@ -213,9 +165,11 @@ mirrors='
 #   URLs:
 #   - ftp://ftp.kaist.ac.kr/nagios-plugins/
 #   - http://ftp.kaist.ac.kr/nagios-plugins/
+#   - https://ftp.kaist.ac.kr/nagios-plugins/
 #
 #   Features:
 #   - IPv4
+#   - IPv6
 #   - Updated daily
 #
 #   Contacts:
@@ -229,6 +183,7 @@ mirrors='
 #
 #   URLs:
 #   - http://mirrors.ustc.edu.cn/monitoring-plugins/
+#   - https://mirrors.ustc.edu.cn/monitoring-plugins/
 #   - rsync://mirrors.ustc.edu.cn/monitoring-plugins/
 #
 #   Features:
@@ -263,12 +218,12 @@ for mirror in $mirrors
 do
         url="${mirror%/}/timestamp"
 
-        if ncftpget -V -t 600 "$url" >'ftp.log' 2>&1
+        if curl -fsSLO -m 600 "$url" >'http.log' 2>&1
         then
                 cmp -s 'expected' 'timestamp' \
                     || echo >&2 "$mirror is outdated ($(cat 'timestamp'))."
         else
-                tail -n 1 'ftp.log' >&2
+                printf '%s failed: %s\n' "$mirror" "$(tail -n 1 'http.log')" >&2
         fi
         rm -f 'timestamp'
 done
diff --git a/etc/nginx.conf b/etc/nginx.conf
index ee815d3..f8e61bf 100644
--- a/etc/nginx.conf
+++ b/etc/nginx.conf
@@ -19,10 +19,12 @@ ssl_dhparam /home/plugins/etc/ssl/dh-parameters.pem;
 # Server definition for <https://www.monitoring-plugins.org/>.
 #
 server {
-        listen 130.133.8.40:443 ssl;
-        listen 130.133.8.40:444 ssl;
+        listen 130.133.8.40:443 ssl http2;
+        listen 130.133.8.40:444 ssl http2;
         server_name www.monitoring-plugins.org;
         root /home/plugins/web/port-$server_port;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
 
         #
         # Downloads and attachments.
@@ -34,7 +36,10 @@ server {
                 }
                 root /home/plugins/web;
                 fancyindex on;
+                fancyindex_default_sort date_desc;
+                fancyindex_name_length 40;
                 fancyindex_exact_size off;
+                fancyindex_time_format "%F";
                 fancyindex_css_href /resources/plugins.css;
                 fancyindex_ignore ^timestamp$;
         }
@@ -78,6 +83,15 @@ server {
         }
 
         #
+        # Rspamd.
+        #
+        location /rspamd/ {
+                proxy_pass http://127.0.0.1:11334/;
+                proxy_set_header Host $host;
+                proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        }
+
+        #
         # Redirects etc.
         #
         location = /favicon.ico {
@@ -119,20 +133,55 @@ server {
 }
 
 #
-# Redirect HTTP and all other domains to <https://www.monitoring-plugins.org/>.
-# Ditto for the test instance.
+# Redirect HTTP to <https://www.monitoring-plugins.org/>.  Ditto for the test
+# instance.
 #
 server {
-        listen 130.133.8.40:80 default_server;
-        listen 130.133.8.40:443 default_server ssl;
+        listen 130.133.8.40:80;
+        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        return 301 https://www.monitoring-plugins.org$request_uri;
+}
+
+server {
+        listen 130.133.8.40:81;
+        server_name monitoring-plugins.org www.monitoring-plugins.org;
+        return 301 https://www.monitoring-plugins.org:444$request_uri;
+}
+
+#
+# Add "www" prefix.  Ditto for the test instance.
+#
+server {
+        listen 130.133.8.40:443 ssl http2;
+        server_name monitoring-plugins.org;
         ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
         ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
         return 301 https://www.monitoring-plugins.org$request_uri;
 }
+
 server {
-        listen 130.133.8.40:81 default_server;
-        listen 130.133.8.40:444 default_server ssl;
+        listen 130.133.8.40:444 ssl http2;
+        server_name monitoring-plugins.org;
         ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
         ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
         return 301 https://www.monitoring-plugins.org:444$request_uri;
 }
+
+#
+# Outdated domains. Can be deleted in 2026.
+#
+server {
+        listen 130.133.8.40:80 default_server;
+        listen 130.133.8.40:443 default_server ssl http2;
+        root /home/plugins/web-redirect;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+}
+
+server {
+        listen 130.133.8.40:81 default_server;
+        listen 130.133.8.40:444 default_server ssl http2;
+        root /home/plugins/web-redirect;
+        ssl_certificate /home/plugins/etc/ssl/monitoring-plugins.crt;
+        ssl_certificate_key /home/plugins/etc/ssl/monitoring-plugins.key;
+}
diff --git a/libexec/git-notify b/libexec/git-notify
index 64da7c0..228c7d6 100755
--- a/libexec/git-notify
+++ b/libexec/git-notify
@@ -4,6 +4,7 @@
 #
 # Copyright 2005 Alexandre Julliard
 # Copyright 2009, 2013 Nagios Plugins Development Team
+# Copyright 2024, 2025 Monitoring Plugins Development Team
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -34,9 +35,12 @@
 #
 
 use strict;
-use Fcntl ':flock';
-use Encode qw(encode decode);
+use utf8;
+use feature qw(evalbytes unicode_eval unicode_strings);
+use open qw(:std :utf8);
 use Cwd 'realpath';
+use Encode qw(encode);
+use Fcntl ':flock';
 
 sub git_config($);
 sub get_repos_name();
@@ -449,7 +453,7 @@ sub send_commit_notice($$)
     my ($ref,$obj) = @_;
     my %info = get_object_info($obj);
     my @notice = ();
-    my ($url,$subject,$obj_string);
+    my ($url,$from,$subject,$obj_string);
 
     if ($gitweb_url)
     {
@@ -515,9 +519,8 @@ sub send_commit_notice($$)
     }
 
     $subject .= truncate_str(${$info{"log"}}[0],50);
-    $_ = decode($info{"encoding"}, $_) for @notice;
-    mail_notification("$info{'committer_name'} <$from_address>", $commitlist_address, $subject,
-        "text/plain; charset=UTF-8", @notice);
+    $from = encode("MIME-Q",$info{'committer_name'}) . " <$from_address>";
+    mail_notification($from, $commitlist_address, $subject, "text/plain; charset=UTF-8", @notice);
 }
 
 # send a commit notice to the CIA server
diff --git a/libexec/poole b/libexec/poole
deleted file mode 100755
index 3735f90..0000000
--- a/libexec/poole
+++ /dev/null
@@ -1,755 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-# =============================================================================
-#
-#    Poole - A damn simple static website generator.
-#    Copyright (C) 2012 Oben Sonne <obensonne@googlemail.com>
-#
-#    This file is part of Poole.
-#
-#    Poole is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation, either version 3 of the License, or
-#    (at your option) any later version.
-#
-#    Poole is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with Poole.  If not, see <http://www.gnu.org/licenses/>.
-#
-# =============================================================================
-
-from __future__ import with_statement
-
-import codecs
-import glob
-import imp
-import optparse
-import os
-from os.path import join as opj
-from os.path import exists as opx
-import re
-import shutil
-import StringIO
-import sys
-import traceback
-import urlparse
-
-from SimpleHTTPServer import SimpleHTTPRequestHandler
-from BaseHTTPServer import HTTPServer
-
-try:
-    import markdown
-except ImportError:
-    print("abort  : need python-markdown, get it from "
-          "http://www.freewisdom.org/projects/python-markdown/Installation")
-    sys.exit(1)
-
-HERE = os.path.dirname(os.path.realpath(__file__))
-
-THEME_DIR = opj(HERE, 'themes')
-
-THEME_NAMES = ['minimal'] + [
-    os.path.basename(x)
-    for x in glob.glob(opj(THEME_DIR, '*'))
-    if os.path.isdir(x)
-]
-
-# =============================================================================
-# init site
-# =============================================================================
-
-EXAMPLE_FILES =  {
-
-"page.html": """<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ __encoding__ }}" />
-    <title>poole - {{ hx(page["title"]) }}</title>
-    <meta name="description" content="{{ hx(page.get("description", "a poole site")) }}" />
-    <meta name="keywords" content="{{ hx(page.get("keywords", "poole")) }}" />
-    <style type="text/css">
-        body {
-            font-family: sans;
-            width: 800px;
-            margin: 1em auto;
-            color: #2e3436;
-        }
-        div#box {
-        }
-        div#header, div#menu, div#content, div#footer {
-            padding: 1em;
-        }
-        div#menu {
-            background-color: #eeeeec;
-            padding: 0.6em 0 0.6em 0;
-        }
-        #menu span {
-            font-weight: bold;
-            padding: 0.6em;
-        }
-        #menu span.current {
-            background-color: #ffffff;
-            border: 1px solid #eeeeec;
-        }
-        #menu a {
-            color: #000000;
-            text-decoration: none;
-        }
-        div#footer {
-            color: gray;
-            text-align: center;
-            font-size: small;
-        }
-        div#footer a {
-            color: gray;
-            text-decoration: none;
-        }
-        pre {
-            border: dotted black 1px;
-            background: #eeeeec;
-            font-size: small;
-            padding: 1em;
-        }
-    </style>
-</head>
-<body>
-    <div id="box">
-    <div id="header">
-         <h1>a poole site</h1>
-         <h2>{{ hx(page["title"]) }}</h2>
-    </div>
-    <div id="menu">
-    <!--%
-        mpages = [p for p in pages if "menu-position" in p]
-        mpages.sort(key=lambda p: int(p["menu-position"]))
-        entry = '<span class="%s"><a href="%s">%s</a></span>'
-        for p in mpages:
-            style = "current" if p["title"] == page["title"] else ""
-            print(entry % (style, p["url"], hx(p["title"])))
-    %-->
-    </div>
-    <div id="content">{{ __content__ }}</div>
-    </div>
-    <div id="footer">
-        Built with <a href="http://bitbucket.org/obensonne/poole">Poole</a>
-        &middot;
-        Licensed as <a href="http://creativecommons.org/licenses/by-sa/3.0">CC-SA</a>
-        &middot;
-        <a href="http://validator.w3.org/check?uri=referer">Validate me</a>
-    </div>
-</body>
-</html>
-""",
-
-# -----------------------------------------------------------------------------
-
-opj("input", "index.md"): """
-title: home
-menu-position: 0
----
-
-## Welcome to Poole
-
-In Poole you write your pages in [markdown][md]. It's easier to write
-markdown than HTML.
-
-Poole is made for simple websites you just want to get done, without installing
-a bunch of requirements and without learning a template engine.
-
-In a build, Poole copies every file from the *input* directory to the *output*
-directory. During that process every markdown file (ending with *md*, *mkd*,
-*mdown* or *markdown*) is converted to HTML using the project's `page.html`
-as a skeleton.
-
-[md]: http://daringfireball.net/projects/markdown/
-""",
-
-# -----------------------------------------------------------------------------
-
-opj("input", "logic.md"): """
-menu-position: 4
----
-Poole has basic support for content generation using Python code inlined in
-page files. This is everything but a clear separation of logic and content but
-for simple sites this is just a pragmatic way to get things done fast.
-For instance the menu on this page is generated by some inlined Python code in
-the project's `page.html` file.
-
-Just ignore this feature if you don't need it :)
-
-Content generation by inlined Python code is good to add some zest to your
-site. If you use it a lot, you better go with more sophisticated site
-generators like [Hyde](http://ringce.com/hyde).
-""",
-
-# -----------------------------------------------------------------------------
-
-opj("input", "layout.md"): """
-menu-position: 3
----
-Every page of a poole site is based on *one global template file*, `page.html`.
-All you need to adjust the site layout is to edit the page template
-`page.html`.
-""",
-
-opj("input", "blog.md"): """
-menu-position: 10
----
-Poole has basic blog support. If an input page's file name has a structure like
-`page-title.YYYY-MM-DD.post-title.md`, e.g. `blog.2010-02-27.read_this.md`,
-Poole recognizes the date and post title and sets them as attributes of the
-page. These attributes can then be used to generate a list of blog posts:
-
-<!--%
-from datetime import datetime
-posts = [p for p in pages if "post" in p] # get all blog post pages
-posts.sort(key=lambda p: p.get("date"), reverse=True) # sort post pages by date
-for p in posts:
-    date = datetime.strptime(p.date, "%Y-%m-%d").strftime("%B %d, %Y")
-    print "  * **[%s](%s)** - %s" % (p.post, p.url, date) # markdown list item
-%-->
-
-Have a look into `input/blog.md` to see how it works. Feel free to adjust it
-to your needs.
-""",
-
-# -----------------------------------------------------------------------------
-
-opj("input", "blog.2013-04-08.Lorem_Ipsum.md") : """
-
----
-## {{ page["post"] }}
-
-*Posted at
-<!--%
-from datetime import datetime
-print datetime.strptime(page["date"], "%Y-%m-%d").strftime("%B %d, %Y")
-%-->*
-
-Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed sed pretium arcu.
-Nullam eu leo ut justo egestas condimentum sed id dolor. In suscipit est eu
-tellus lacinia congue. Nunc tincidunt posuere nibh vitae accumsan. Suspendisse
-quis justo quis nulla rhoncus venenatis. Cum sociis natoque penatibus et magnis
-dis parturient montes, nascetur ridiculus mus. Suspendisse potenti.
-
-Nullam luctus tortor ac libero eleifend interdum nec eget dolor. Aliquam quis
-massa metus, id fringilla odio. Fusce lobortis sollicitudin gravida. Donec
-porttitor metus aliquam diam consectetur vitae tristique ligula aliquet. Nulla
-facilisi. Mauris eleifend erat id velit eleifend facilisis. Proin orci lacus,
-imperdiet eu mollis ac, cursus sit amet ligula. Ut id neque urna, sed dignissim
-urna. Cras sit amet sodales orci. In at lacus dui. Duis mi neque, posuere ut
-congue non, ornare a magna. Fusce massa ligula, vestibulum sed vulputate quis,
-sodales at massa.
-
-No-ASCII characters like `öäüß` are no problems as long as input files are
-encoded in UTF8.
-""",
-
-# -----------------------------------------------------------------------------
-
-opj("input", "blog.2013-04-01.Holy_Grail.md"): """
-
-## {{ page["post"] }}
-
-*Posted at <!--{ page["date"] }-->.*
-
-Knights of Ni, we are but simple travelers who seek the enchanter who lives
-beyond these woods. A newt? Did you dress her up like this? On second thoughts,
-let's not go there. It is a silly place. You don't vote for kings. Knights of
-Ni, we are but simple travelers who seek the enchanter who lives beyond these
-woods.
-
-### Bridgekeeper ###
-
-Camelot! What do you mean? And this isn't my nose. This is a false one. Ah, now
-we see the violence inherent in the system!
-
-You don't frighten us, English pig-dogs! Go and boil your bottoms, sons of a
-silly person! I blow my nose at you, so-called Ah-thoor Keeng, you and all your
-silly English K-n-n-n-n-n-n-n-niggits! I don't want to talk to you no more, you
-empty-headed animal food trough water! I fart in your general direction! Your
-mother was a hamster and your father smelt of elderberries! Now leave before I
-am forced to taunt you a second time! Shh! Knights, I bid you welcome to your
-new home. Let us ride to Camelot! Now, look here, my good man.
-
-### What a strange ###
-
-She looks like one. Why do you think that she is a witch? Look, my liege! Bring
-her forward!
-
-[Ni!](http://chrisvalleskey.com/fillerama/)
-""",
-}
-
-def init(project, theme):
-    """Initialize a site project."""
-
-    if not opx(project):
-        os.makedirs(project)
-
-    if os.listdir(project):
-        print("abort  : project dir %s is not empty" % project)
-        sys.exit(1)
-
-    dir_in = opj(project, "input")
-    dir_out = opj(project, "output")
-
-    os.mkdir(dir_in)
-    os.mkdir(dir_out)
-
-    for fname, content in EXAMPLE_FILES.items():
-        print('info: create example %r' % fname)
-        with open(opj(project, fname), 'w') as fp:
-            fp.write(content)
-
-    if theme != 'minimal':
-        shutil.copy(opj(THEME_DIR, theme, 'page.html'), project)
-        for fname in glob.glob(opj(THEME_DIR, theme, '*')):
-            print('info: copy theme data %r' % fname)
-            if os.path.basename(fname) == 'page.html':
-                continue
-            if os.path.isdir(fname):
-                shutil.copytree(fname, opj(dir_in, os.path.basename(fname)))
-            else:
-                shutil.copy(fname, dir_in)
-
-    print("success: initialized project")
-
-# =============================================================================
-# build site
-# =============================================================================
-
-MKD_PATT = r'\.(?:md|mkd|mdown|markdown)$'
-
-def hx(s):
-    """
-    Replace the characters that are special within HTML (&, <, > and ")
-    with their equivalent character entity (e.g., &amp;). This should be
-    called whenever an arbitrary string is inserted into HTML (so in most
-    places where you use {{ variable }} in your templates).
-
-    Note that " is not special in most HTML, only within attributes.
-    However, since escaping it does not hurt within normal HTML, it is
-    just escaped unconditionally.
-    """
-    if getattr(s, 'escaped', False):
-        return s
-
-    escape = {
-        "&": "&amp;",
-        '"': "&quot;",
-        ">": "&gt;",
-        "<": "&lt;",
-    }
-    return ''.join(escape.get(c, c) for c in s)
-
-class Page(dict):
-    """Abstraction of a source page."""
-
-    _template = None # template dictionary
-    _opts = None # command line options
-    _pstrip = None # path prefix to strip from (non-virtual) page file names
-
-    _re_eom = re.compile(r'^---+ *\r?\n?$')
-    _re_vardef = re.compile(r'^([^\n:=]+?)[:=]((?:.|\n )*)', re.MULTILINE)
-    _sec_macros = "macros"
-    _modmacs = None
-
-    def __init__(self, fname, virtual=None, **attrs):
-        """Create a new page.
-
-        Page content is read from `fname`, except when `virtual` is given (a
-        string representing the raw content of a virtual page).
-
-        The filename refers to the page source file. For virtual pages, this
-        *must* be relative to a projects input directory.
-
-        Virtual pages may contain page attribute definitions similar to real
-        pages. However, it probably is easier to provide the attributes
-        directly. This may be done using arbitrary keyword arguments.
-
-        """
-        super(Page, self).__init__()
-
-        self.update(self._template)
-        self.update(attrs)
-
-        self._virtual = virtual is not None
-
-        fname = opj(self._pstrip, fname) if virtual else fname
-
-        self["fname"] = fname
-
-        self["url"] = re.sub(MKD_PATT, ".html", fname)
-        self["url"] = self["url"][len(self._pstrip):].lstrip(os.path.sep)
-        self["url"] = self["url"].replace(os.path.sep, "/")
-
-        if virtual:
-            self.raw = virtual
-        else:
-            with codecs.open(fname, 'r', self._opts.input_enc) as fp:
-                self.raw = fp.readlines()
-
-        # split raw content into macro definitions and real content
-        vardefs = ""
-        self.source = ""
-        for line in self.raw:
-            if not vardefs and self._re_eom.match(line):
-                vardefs = self.source
-                self.source = "" # only macro defs until here, reset source
-            else:
-                self.source += line
-
-        for key, val in self._re_vardef.findall(vardefs):
-            key = key.strip()
-            val = val.strip()
-            val = re.sub(r' *\n +', ' ', val) # clean out line continuation
-            self[key] = val
-
-        basename = os.path.basename(fname)
-
-        fpatt = r'(.+?)(?:\.([0-9]+-[0-9]+-[0-9]+)(?:\.(.*))?)?%s' % MKD_PATT
-        title, date, post = re.match(fpatt, basename).groups()
-        title = title.replace("_", " ")
-        post = post and post.replace("_", " ") or None
-        self["title"] = self.get("title", title)
-        if date and "date" not in self: self["date"] = date
-        if post and "post" not in self: self["post"] = post
-
-        self.html = ""
-
-    def __getattr__(self, name):
-        """Attribute-style access to dictionary items."""
-        try:
-            return self[name]
-        except KeyError:
-            raise AttributeError(name)
-
-    def __str__(self):
-        """Page representation by file name."""
-        return ('%s (virtual)' % self.fname) if self._virtual else self.fname
-
-# -----------------------------------------------------------------------------
-
-def build(project, opts):
-    """Build a site project."""
-
-    # -------------------------------------------------------------------------
-    # utilities
-    # -------------------------------------------------------------------------
-
-    def abort_iex(page, itype, inline, exc):
-        """Abort because of an exception in inlined Python code."""
-        print("abort  : Python %s in %s failed" % (itype, page))
-        print((" %s raising the exception " % itype).center(79, "-"))
-        print(inline)
-        print(" exception ".center(79, "-"))
-        print(exc)
-        sys.exit(1)
-
-    def copy(src, dst):
-        if os.path.islink(src):
-            linkto = os.readlink(src)
-            if os.path.isdir(dst):
-                dst = opj(dst, os.path.basename(src))
-            os.symlink(linkto, dst)
-        else:
-            shutil.copy2(src, opj(dir_out, cwd_site))
-
-    # -------------------------------------------------------------------------
-    # regex patterns and replacements
-    # -------------------------------------------------------------------------
-
-    regx_escp = re.compile(r'\\((?:(?:&lt;|<)!--|{)(?:{|%))') # escaped code
-    repl_escp = r'\1'
-    regx_rurl = re.compile(r'(?<=(?:(?:\n| )src|href)=")([^#/&%].*?)(?=")')
-    repl_rurl = lambda m: urlparse.urljoin(opts.base_url, m.group(1))
-
-    regx_eval = re.compile(r'(?<!\\)(?:(?:<!--|{){)(.*?)(?:}(?:-->|}))', re.S)
-
-    def repl_eval(m):
-        """Replace a Python expression block by its evaluation."""
-
-        expr = m.group(1)
-        try:
-            repl = eval(expr, macros.copy())
-        except:
-            abort_iex(page, "expression", expr, traceback.format_exc())
-        else:
-            if not isinstance(repl, basestring): # e.g. numbers
-                repl = unicode(repl)
-            elif not isinstance(repl, unicode):
-                repl = repl.decode("utf-8")
-            return repl
-
-    regx_exec = re.compile(r'(?<!\\)(?:(?:<!--|{)%)(.*?)(?:%(?:-->|}))', re.S)
-
-    def repl_exec(m):
-        """Replace a block of Python statements by their standard output."""
-
-        stmt = m.group(1).replace("\r\n", "\n")
-
-        # base indentation
-        ind_lvl = len(re.findall(r'^(?: *\n)*( *)', stmt, re.MULTILINE)[0])
-        ind_rex = re.compile(r'^ {0,%d}' % ind_lvl, re.MULTILINE)
-        stmt = ind_rex.sub('', stmt)
-
-        # execute
-        sys.stdout = StringIO.StringIO()
-        try:
-            exec stmt in macros.copy()
-        except:
-            sys.stdout = sys.__stdout__
-            abort_iex(page, "statements", stmt, traceback.format_exc())
-        else:
-            repl = sys.stdout.getvalue()[:-1] # remove last line break
-            sys.stdout = sys.__stdout__
-            if not isinstance(repl, unicode):
-                repl = repl.decode(opts.input_enc)
-            return repl
-
-    # -------------------------------------------------------------------------
-    # preparations
-    # -------------------------------------------------------------------------
-
-    dir_in = opj(project, "input")
-    dir_out = opj(project, "output")
-    page_html = opj(project, "page.html")
-
-    # check required files and folders
-    for pelem in (page_html, dir_in, dir_out):
-        if not opx(pelem):
-            print("abort  : %s does not exist, looks like project has not been "
-                  "initialized" % pelem)
-            sys.exit(1)
-
-    # prepare output directory
-    for fod in glob.glob(opj(dir_out, "*")):
-        if os.path.isdir(fod):
-            shutil.rmtree(fod)
-        else:
-            os.remove(fod)
-    if not opx(dir_out):
-        os.mkdir(dir_out)
-
-    # macro module
-    fname = opj(opts.project, "macros.py")
-    macros = imp.load_source("macros", fname).__dict__ if opx(fname) else {}
-
-    macros["__encoding__"] = opts.output_enc
-    macros["options"] = opts
-    macros["project"] = project
-    macros["input"] = dir_in
-    macros["output"] = dir_out
-
-    # "builtin" items for use in macros and templates
-    macros["hx"] = hx
-    macros["htmlspecialchars"] = hx # legacy name of `htmlx` function
-    macros["Page"] = Page
-
-    # -------------------------------------------------------------------------
-    # process input files
-    # -------------------------------------------------------------------------
-
-    Page._template = macros.get("page", {})
-    Page._opts = opts
-    Page._pstrip = dir_in
-    pages = []
-    custom_converter = macros.get('converter', {})
-
-    for cwd, dirs, files in os.walk(dir_in.decode(opts.filename_enc)):
-        cwd_site = cwd[len(dir_in):].lstrip(os.path.sep)
-        for sdir in dirs[:]:
-            if re.search(opts.ignore, opj(cwd_site, sdir)):
-                dirs.remove(sdir)
-            else:
-                os.mkdir(opj(dir_out, cwd_site, sdir))
-        for f in files:
-            if re.search(opts.ignore, opj(cwd_site, f)):
-                pass
-            elif re.search(MKD_PATT, f):
-                page = Page(opj(cwd, f))
-                pages.append(page)
-            else:
-                # either use a custom converter or do a plain copy
-                for patt, (func, ext) in custom_converter.items():
-                    if re.search(patt, f):
-                        f_src = opj(cwd, f)
-                        f_dst = opj(dir_out, cwd_site, f)
-                        f_dst = '%s.%s' % (os.path.splitext(f_dst)[0], ext)
-                        print('info   : convert %s (%s)' % (f_src, func.__name__))
-                        func(f_src, f_dst)
-                        break
-                else:
-                    src = opj(cwd, f)
-                    try:
-                        copy(src, opj(dir_out, cwd_site))
-                    except OSError:
-                        # some filesystems like FAT won't allow shutil.copy
-                        shutil.copyfile(src, opj(dir_out, cwd_site, f))
-
-    pages.sort(key=lambda p: int(p.get("sval", "0")))
-
-    macros["pages"] = pages
-
-    # -------------------------------------------------------------------------
-    # run pre-convert hooks in macro module (named 'once' before)
-    # -------------------------------------------------------------------------
-
-    hooks = [a for a in macros if re.match(r'hook_preconvert_|once_', a)]
-    for fn in sorted(hooks):
-        macros[fn]()
-
-    # -------------------------------------------------------------------------
-    # convert pages (markdown to HTML)
-    # -------------------------------------------------------------------------
-
-    for page in pages:
-
-        print("info   : convert %s" % page)
-
-        # replace expressions and statements in page source
-        macros["page"] = page
-        out = regx_eval.sub(repl_eval, page.source)
-        out = regx_exec.sub(repl_exec, out)
-
-        # convert to HTML
-        page.html = markdown.Markdown(extensions=opts.md_ext).convert(out)
-
-    # -------------------------------------------------------------------------
-    # run post-convert hooks in macro module
-    # -------------------------------------------------------------------------
-
-    hooks = [a for a in macros if a.startswith("hook_postconvert_")]
-    for fn in sorted(hooks):
-        macros[fn]()
-
-    # -------------------------------------------------------------------------
-    # render complete HTML pages
-    # -------------------------------------------------------------------------
-
-    with codecs.open(opj(project, "page.html"), 'r', opts.input_enc) as fp:
-        skeleton = fp.read()
-
-    for page in pages:
-
-        print("info   : render %s" % page.url)
-
-        # replace expressions and statements in page.html
-        macros["page"] = page
-        macros["__content__"] = page.html
-        out = regx_eval.sub(repl_eval, skeleton)
-        out = regx_exec.sub(repl_exec, out)
-
-        # un-escape escaped python code blocks
-        out = regx_escp.sub(repl_escp, out)
-
-        # make relative links absolute
-        out = regx_rurl.sub(repl_rurl, out)
-
-        # write HTML page
-        fname = page.fname.replace(dir_in, dir_out)
-        fname = re.sub(MKD_PATT, ".html", fname)
-        with codecs.open(fname, 'w', opts.output_enc) as fp:
-            fp.write(out)
-
-    print("success: built project")
-
-# =============================================================================
-# serve site
-# =============================================================================
-
-def serve(project, port):
-    """Temporary serve a site project."""
-
-    root = opj(project, "output")
-    if not os.listdir(project):
-        print("abort  : output dir is empty (build project first!)")
-        sys.exit(1)
-
-    os.chdir(root)
-    server = HTTPServer(('', port), SimpleHTTPRequestHandler)
-    server.serve_forever()
-
-# =============================================================================
-# options
-# =============================================================================
-
-def options():
-    """Parse and validate command line arguments."""
-
-    usage = ("Usage: %prog --init  [OPTIONS] [path/to/project]\n"
-             "       %prog --build [OPTIONS] [path/to/project]\n"
-             "       %prog --serve [OPTIONS] [path/to/project]\n"
-             "\n"
-             "       Project path is optional, '.' is used as default.")
-
-    op = optparse.OptionParser(usage=usage)
-
-    op.add_option("-i" , "--init", action="store_true", default=False,
-                  help="init project")
-    op.add_option("-b" , "--build", action="store_true", default=False,
-                  help="build project")
-    op.add_option("-s" , "--serve", action="store_true", default=False,
-                  help="serve project")
-
-    og = optparse.OptionGroup(op, "Init options")
-    og.add_option("", "--theme", type="choice", default="minimal",
-                  choices=THEME_NAMES,
-                  help="theme for a new project (choices: %s)" % ', '.join(THEME_NAMES))
-    op.add_option_group(og)
-
-    og = optparse.OptionGroup(op, "Build options")
-    og.add_option("", "--base-url", default="/", metavar="URL",
-                  help="base url for relative links (default: /)")
-    og.add_option("" , "--ignore", default=r"^\.|~$", metavar="REGEX",
-                  help="input files to ignore (default: '^\.|~$')")
-    og.add_option("" , "--md-ext", default=[], metavar="EXT",
-                  action="append", help="enable a markdown extension")
-    og.add_option("", "--input-enc", default="utf-8", metavar="ENC",
-                  help="encoding of input pages (default: utf-8)")
-    og.add_option("", "--output-enc", default="utf-8", metavar="ENC",
-                  help="encoding of output pages (default: utf-8)")
-    og.add_option("", "--filename-enc", default="utf-8", metavar="ENC",
-                  help="encoding of file names (default: utf-8)")
-    op.add_option_group(og)
-
-    og = optparse.OptionGroup(op, "Serve options")
-    og.add_option("" , "--port", default=8080,
-                  metavar="PORT", type="int",
-                  help="port for serving (default: 8080)")
-    op.add_option_group(og)
-
-    opts, args = op.parse_args()
-
-    if opts.init + opts.build + opts.serve < 1:
-        op.print_help()
-        op.exit()
-
-    opts.project = args and args[0] or "."
-
-    return opts
-
-# =============================================================================
-# main
-# =============================================================================
-
-def main():
-
-    opts = options()
-
-    if opts.init:
-        init(opts.project, opts.theme)
-    if opts.build:
-        build(opts.project, opts)
-    if opts.serve:
-        serve(opts.project, opts.port)
-
-if __name__ == '__main__':
-
-    main()
diff --git a/logo/monitoring-plugins-logo.svg b/logo/monitoring-plugins-logo.svg
new file mode 100644
index 0000000..a4c0a8c
--- /dev/null
+++ b/logo/monitoring-plugins-logo.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg enable-background="new 0 0 400 400" version="1.1" viewBox="0 0 400 400" xmlns="http://www.w3.org/2000/svg">
+ <path d="m229 401h-227.96v-399.9h399.8v399.9h-171.84m-98.055-111.4c1.7595 20.751 4.3705 41.345 11.996 60.93 5.556 14.27 14.202 25.384 29.983 29.38 3.7832 0.95801 7.5948 0.96225 9.4829-2.0467 1.3598-2.1671 1.2246-6.1725 0.2316-8.7766-10.271-26.935-18.244-54.49-23.244-82.887-0.41646-2.3651-0.3638-4.8129-0.54993-7.5258 1.6416 0.078552 2.6109 0.085235 3.5721 0.17694 13.877 1.3241 27.579 2.5204 41.691 0.56299 28.225-3.9149 52.43-15.397 72.53-35.277 22.102-21.86 34.147-48.73 37.423-79.539 3.0643-28.819-1.9521-56.049-17.23-80.919-20.046-32.631-50.418-49.55-87.486-54.154-29.996-3.7251-58.167 2.449-82.749 21.404-16.565 12.773-31.464 26.838-37.419 47.729-3.4788 12.203-4.0628 24.657 0.88403 36.729 3.2219 7.8627 10.57 10.836 18.322 7.8787 7.7131-2.9429 11.067-10.127 8.3491-18.211-1.056-3.1413-2.3707-6.2034-3.6993-9.2441-5.3279-12.194-4.9894-24.464 0.64456-36.253 11.889-24.878 33.148-37.834 59.224-42.202 22.455-3.7619 43.711 1.6097 61.999 15.816 32.137 24.964 46.402 59.195 48.755 98.669 1.5185 25.467-5.4491 49.322-18.382 71.434-21.057 36.002-60.218 56.441-103.39 44.8-3.4929-0.9419-5.5533-2.5361-5.7879-6.3405-0.584-9.4685-1.9139-18.93-1.8783-28.39 0.07956-21.141 0.62759-42.285 1.3168-63.417 0.99449-30.494 4.9942-60.649 10.773-90.59 0.27675-1.4338-0.89792-3.1478-1.3967-4.7313-1.5896 0.81478-3.9243 1.2223-4.633 2.5187-2.3822 4.3581-4.7028 8.8782-6.1167 13.614-5.0264 16.836-10.395 33.623-14.241 50.741-3.4882 15.525-5.8868 31.387-7.4399 47.231-1.7858 18.216-2.1077 36.576-3.097 54.872-0.048386 0.89488-0.39987 1.7734-0.81609 3.5269-2.3973-2.1286-4.0817-3.9067-6.0385-5.3032-4.1583-2.9678-8.33-5.9581-12.741-8.5165-3.4146-1.9803-7.6648-2.1283-10.029 1.1114-1.9518 2.675-2.7932 6.5781-2.9524 9.9918-0.1012 2.1696 1.6509 4.6517 3.0787 6.6275 6.1984 8.5777 15.354 13.015 24.774 16.868 3.3218 1.3587 5.2033 3.0851 5.3024 6.8225 0.12363 4.6573 0.61266 9.305 0.98292 14.89z" fill="#5A95C7"/>
+ <path d="m130.93 289.13c-0.35075-5.1186-0.83978-9.7663-0.96341-14.424-0.099182-3.7374-1.9807-5.4638-5.3024-6.8225-9.4199-3.8531-18.576-8.2907-24.774-16.868-1.4278-1.9758-3.1799-4.4579-3.0787-6.6275 0.15923-3.4137 1.0006-7.3168 2.9524-9.9918 2.3639-3.2398 6.6141-3.0918 10.029-1.1114 4.4114 2.5584 8.5831 5.5487 12.741 8.5165 1.9568 1.3966 3.6412 3.1747 6.0385 5.3032 0.41621-1.7535 0.7677-2.632 0.81609-3.5269 0.98932-18.296 1.3112-36.655 3.097-54.872 1.5532-15.843 3.9518-31.706 7.4399-47.231 3.8461-17.118 9.2148-33.906 14.241-50.741 1.4139-4.7359 3.7345-9.256 6.1167-13.614 0.70863-1.2964 3.0433-1.7039 4.633-2.5187 0.49876 1.5835 1.6734 3.2975 1.3967 4.7313-5.7792 29.942-9.7789 60.097-10.773 90.59-0.68918 21.132-1.2372 42.276-1.3168 63.417-0.035598 9.4601 1.2943 18.921 1.8783 28.39 0.23465 3.8044 2.2951 5.3987 5.7879 6.3405 43.169 11.641 82.33-8.7983 103.39-44.8 12.933-22.113 19.901-45.967 18.382-71.434-2.3535-39.473-16.618-73.704-48.755-98.669-18.288-14.206-39.543-19.578-61.999-15.816-26.077 4.3687-47.336 17.325-59.224 42.202-5.6339 11.789-5.9725 24.059-0.64456 36.253 1.3286 3.0406 2.6433 6.1027 3.6993 9.2441 2.7177 8.0844-0.63596 15.268-8.3491 18.211-7.7522 2.9578-15.1-0.015976-18.322-7.8787-4.9468-12.072-4.3629-24.526-0.88403-36.729 5.9557-20.891 20.855-34.956 37.419-47.729 24.582-18.955 52.753-25.129 82.749-21.404 37.068 4.6033 67.44 21.522 87.486 54.154 15.278 24.87 20.295 52.1 17.23 80.919-3.276 30.809-15.321 57.679-37.423 79.539-20.101 19.88-44.305 31.362-72.53 35.277-14.112 1.9574-27.815 0.76108-41.691-0.56299-0.96117-0.091705-1.9304-0.098388-3.5721-0.17694 0.18613 2.7129 0.13347 5.1607 0.54993 7.5258 5 28.397 12.973 55.952 23.244 82.887 0.99298 2.6041 1.1282 6.6096-0.2316 8.7766-1.888 3.009-5.6997 3.0047-9.4829 2.0467-15.781-3.9961-24.427-15.11-29.983-29.38-7.6255-19.585-10.237-40.179-12.016-61.397z" fill="#023560"/>
+</svg>
diff --git a/web/README b/web/README
index 48e360c..3a0aadf 100644
--- a/web/README
+++ b/web/README
@@ -2,7 +2,9 @@ Web Site Design
 ===============
 
 The Monitoring Plugins web site is generated using
-<https://bitbucket.org/obensonne/poole>.
+<https://hg.sr.ht/~obensonne/poole>.
+
+The following helper sites are dead by now, unfortunately:
 
 Color scheme
 ------------
diff --git a/web/input/development.md b/web/input/development.md
index 10411c8..67cd3a8 100644
--- a/web/input/development.md
+++ b/web/input/development.md
@@ -48,15 +48,15 @@ commands:
 Also see our testing-related [development FAQs][dev-faq].
 
 [team]: team.html "Monitoring Plugins Development Team"
-[nagios]: http://www.nagios.org/ "Nagios"
+[nagios]: https://www.nagios.org/ "Nagios"
 [github]: https://github.com/ "GitHub"
 [fork]: https://help.github.com/articles/fork-a-repo "Fork Documentation"
 [pull]: https://help.github.com/articles/using-pull-requests "Pull Request Documentation"
 [git-intro]: doc/faq/git.html "Quick Git Introduction"
 [git-ref]: doc/faq/git.html#references "Git References"
-[master-img]:  https://github.com/monitoring-plugins/monitoring-plugins/actions/workflows/test.yml/badge.svg?branch=master"Build Status master"
+[master-img]:  https://github.com/monitoring-plugins/monitoring-plugins/actions/workflows/test.yml/badge.svg?branch=master "Build Status master"
 [coverity-img]: https://scan.coverity.com/projects/1435/badge.svg?flat=1 "Coverity Metric"
-[libtap]: http://jc.ngo.org.uk/trac-bin/trac.cgi/wiki/LibTap "LibTap Homepage"
+[libtap]: https://github.com/zorgnax/libtap "LibTap Homepage"
 [dev-faq]: doc/faq/#development "Development FAQs"
 [github-actions]: https://docs.github.com/en/actions "GitHub Docs - GitHub Actions"
 [github-ci-actions]: https://github.com/monitoring-plugins/monitoring-plugins/actions "Monitoring Plugins - Github Workflows"
diff --git a/web/input/download.md b/web/input/download.md
index 8c77023..b60b49f 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -17,10 +17,9 @@ from here:
 
 See the [release history][news] for an overview of changes between earlier
 versions.  Old releases can be found in the [download area][download].  There
-are FTP mirrors available in [Belgium][mirror-be], [China][mirror-cn],
-[Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr], [New
-Zealand][mirror-nz], [Portugal][mirror-pt], [Russia][mirror-ru], [South
-Africa][mirror-za], [Sweden][mirror-se], the [UK][mirror-uk], and the
+are mirrors available in [Belgium][mirror-be], [China][mirror-cn],
+[Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr],
+[Portugal][mirror-pt], [Russia][mirror-ru], [Sweden][mirror-se], and the
 [USA][mirror-us].
 
 ### Development Snapshot
@@ -38,7 +37,7 @@ directory][snapshot] of the [download area][download].
 
 The Monitoring::Plugin module is available from [CPAN][cpan]:
 
-* <http://search.cpan.org/dist/Monitoring-Plugin/>
+* <https://metacpan.org/dist/Monitoring-Plugin>
 
 ## NagiosMIB
 
@@ -49,24 +48,22 @@ The current NagiosMIB tarball is available from here:
 Old versions can be found [within][mib] the [download area][download].
 
 [announcement]: {{release_notes}} "Release Announcement"
-[mirror-be]: ftp://ftp.belnet.be/mirror/nagios-plugins.org/ "FTP Mirror in Belgium"
-[mirror-cn]: http://mirrors.ustc.edu.cn/monitoring-plugins/ "HTTP Mirror in China"
-[mirror-de]: ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "FTP Mirror in Germany"
-[mirror-gr]: ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ "FTP Mirror in Greece"
-[mirror-kr]: ftp://ftp.kaist.ac.kr/nagios-plugins/ "FTP Mirror in Korea"
-[mirror-nz]: ftp://mirror.webtastix.net/monitoring-plugins/ "FTP Mirror in New Zealand"
-[mirror-pt]: ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ "FTP Mirror in Portugal"
-[mirror-ru]: ftp://mirror.mephi.ru/nagios-plugins/ "FTP Mirror in Russia"
-[mirror-za]: ftp://mirror.is.co.za/mirror/monitoring-plugins.org/ "FTP Mirror in South Africa"
-[mirror-se]: ftp://ftp.lysator.liu.se/pub/monitoring-plugins/ "FTP Mirror in Sweden"
-[mirror-uk]: ftp://mirror.bytemark.co.uk/monitoring-plugins/ "FTP Mirror in the United Kingdom"
-[mirror-us]: ftp://ftp.osuosl.org/pub/monitoring-plugins/ "FTP Mirror in the United States"
+[mirror-be]: https://ftp.belnet.be/mirror/nagios-plugins.org/ "Mirror in Belgium"
+[mirror-cn]: https://mirrors.ustc.edu.cn/monitoring-plugins/ "Mirror in China"
+[mirror-de]: https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "Mirror in Germany"
+[mirror-gr]: https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ "Mirror in Greece"
+[mirror-kr]: https://ftp.kaist.ac.kr/nagios-plugins/ "Mirror in Korea"
+[mirror-pt]: https://mirrors.fe.up.pt/pub/monitoring-plugins/ "Mirror in Portugal"
+[mirror-ru]: http://mirror.mephi.ru/nagios-plugins/ "Mirror in Russia"
+[mirror-se]: https://ftp.lysator.liu.se/pub/monitoring-plugins/ "Mirror in Sweden"
+[mirror-uk]: https://mirror.bytemark.co.uk/monitoring-plugins/ "Mirror in the United Kingdom"
+[mirror-us]: https://ftp2.osuosl.org/pub/monitoring-plugins/ "Mirror in the United States"
 [repository]: https://github.com/monitoring-plugins/monitoring-plugins "Monitoring Plugins Git Repository"
 [news]: doc/news.txt "NEWS"
 [download]: download/ "Download Area"
 [snapshot]: download/snapshot/ "Snapshot Directory"
 [mib]: download/mib/ "NagiosMIB Directory"
-[cpan]: http://www.cpan.org/ "CPAN"
+[cpan]: https://www.cpan.org/ "CPAN"
 [tar1]: download/monitoring-plugins-{{plugins_release}}.tar.gz "Current Release Tarball"
 [sum1]: download/monitoring-plugins-{{plugins_release}}.tar.gz.sha1 "SHA-1 Sum"
 [tar2]: download/snapshot/monitoring-plugins-master.tar.gz "Current Snapshot Tarball"
diff --git a/web/input/impressum.md b/web/input/impressum.md
index 83984cb..d79ea74 100644
--- a/web/input/impressum.md
+++ b/web/input/impressum.md
@@ -9,12 +9,12 @@ parent: Home
 Responsible for the content of this site:
 
 Holger Weiß  
-Gutsmuthsstr. 19  
+Buggestr. 11  
 12163 Berlin  
 Germany
 
 **Phone:**  
-&emsp; +49 30 61286685
+&emsp; +49 160 7282852
 
 **Email:**  
 &emsp; holger@zedat.fu-berlin.de
@@ -22,6 +22,6 @@ Germany
 **Jabber:**  
 &emsp; holger@jabber.fu-berlin.de
 
-[law]: http://www.gesetze-im-internet.de/tmg/__5.html
+[law]: https://www.gesetze-im-internet.de/ddg/__5.html
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/index.md b/web/input/index.md
index 93e7286..29a9285 100644
--- a/web/input/index.md
+++ b/web/input/index.md
@@ -2,7 +2,7 @@ title: Home
 menu: 1
 ---
 
-# The Monitoring Plugins Project
+# Monitoring Plugins
 
 We, the [Monitoring Plugins Development Team][team], maintain a bundle of more
 than fifty standard plugins for [Icinga][icinga], [Naemon][naemon],
@@ -33,25 +33,25 @@ monitoring products as well.
 You can get the latest releases from the [download page][download].
 
 [team]: team.html "Monitoring Plugins Development Team"
-[icinga]: https://www.icinga.org/ "Icinga"
-[naemon]: http://naemon.github.io/ "Naemon"
-[nagios]: http://www.nagios.org/ "Nagios"
-[sensu]: http://sensuapp.org/ "Sensu"
-[shinken]: http://www.shinken-monitoring.org/ "Shinken"
+[icinga]: https://icinga.com/ "Icinga"
+[naemon]: https://www.naemon.io/ "Naemon"
+[nagios]: https://www.nagios.org/ "Nagios"
+[sensu]: https://sensu.io/ "Sensu"
+[shinken]: https://github.com/shinken-solutions/shinken "Shinken"
 [load]: doc/man/check_load.html "check_load"
 [procs]: doc/man/check_procs.html "check_procs"
 [disk]: doc/man/check_disk.html "check_disk"
 [icmp]: doc/man/check_icmp.html "check_icmp"
 [snmp]: doc/man/check_snmp.html "check_snmp"
 [http]: doc/man/check_http.html "check_http"
-[nagex]: http://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
-[icnex]: https://exchange.icinga.org/dig/Plugins "Plugins on Icinga Exchange"
-[module]: http://search.cpan.org/dist/Monitoring-Plugin/ "Monitoring::Plugin Module"
+[nagex]: https://exchange.nagios.org/directory/Plugins "Plugins on Nagios Exchange"
+[icnex]: https://exchange.icinga.com/ "Icinga Exchange"
+[module]: https://metacpan.org/dist/Monitoring-Plugin "Monitoring::Plugin Module"
 [guidelines]: doc/guidelines.html "Monitoring Plugin Development Guidelines"
 [perl-plugins]: doc/writing-perl-plugins.html "Monitoring::Plugin Presentation"
 [rename]: news/new-project-name.html "New Project Name"
-[history]: http://www.nagios.org/about/history "Nagios (Plugins) History"
-[folks]: http://www.nagios.org/about/team "Nagios Team"
+[history]: https://www.nagios.org/about/history/ "Nagios (Plugins) History"
+[folks]: https://www.nagios.org/team/ "Nagios Team"
 [download]: download.html "Download"
 
 <!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/bluehats-prize.md b/web/input/news/bluehats-prize.md
new file mode 100644
index 0000000..b17a5b1
--- /dev/null
+++ b/web/input/news/bluehats-prize.md
@@ -0,0 +1,39 @@
+title: Monitoring Plugins Wins BlueHats Prize
+author: Holger Weiß
+date: 2024-12-30
+---
+
+As [announced](https://nlnet.nl/bluehatsprize/2024/4.html) by the NLnet
+Foundation, the Monitoring Plugins team is the winner of the fourth 2024
+BlueHats prize!<end-of-teaser>
+
+[BlueHats][bluehats] prizes are an initiative by the French Interministerial
+Digital Directorate.  They are awarded to maintainers of critical free and open
+source projects.  In 2024, four prizes of € 10,000 each have been given out.
+
+The jury, made up of public officials from [ANSSI][anssi] and [DINUM][dinum],
+recognised the central role of Monitoring Plugins in the running of Internet
+services.  Monitoring Plugins is critical infrastructure that is widely used and
+relies on a small group of contributors.  The interface is simple, but the tasks
+that the plugins perform can be hard to perform and has to be efficient.  Since
+so many systems run these programs often, they need to be reliable and safe.
+
+A representative of DINUM says:
+
+> We know for sure that many public administrations depend indirectly on Monitoring Plugins: this project is typical of a niche Free Software initiative that helps other tools to remain accurate, here in the monitoring area.  We hope that this award will help the maintainers to get more sponsors and direct contributions!
+
+The Monitoring Plugins team is honored by the recognition by the jury.  As a
+small corner stone of many IT monitoring solutions, we are seldom as visible as
+big name projects, but are happy to contribute our part to support the
+infrastructure all of us rely on in our society.  Especially as infrastructure
+is often boring (as it should be), it is not often visible and usually only
+receives attention when it fails.  In this spirit we are particulary thankful
+for people and institutions who care about the small and boring little cogs of
+the big machinery.  This is not self-evident and we appreciate the effort and
+hope to continue to provide reliable software to the world.
+
+[bluehats]: https://code.gouv.fr/en/bluehats/
+[anssi]: https://cyber.gouv.fr/en
+[dinum]: https://www.numerique.gouv.fr/dinum/
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-2-3-2.md b/web/input/news/release-2-3-2.md
new file mode 100644
index 0000000..e2e99b7
--- /dev/null
+++ b/web/input/news/release-2-3-2.md
@@ -0,0 +1,109 @@
+title: Version 2.3.2 Released
+author: Sven Nierlein
+date: 2022-10-20
+---
+
+The Monitoring Plugins Development Team is proud to announce version 2.3.2 of
+the Monitoring Plugins! This release comes with various fixes provided by more
+than 40 contributors. Many thanks to all of you!
+<end-of-teaser>
+
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+
+### General
+* Use netcat-openbsd for debian explicitely by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1704
+* Replace egrep with grep -E by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1791
+* Use silent automake by default by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1747
+
+### Single Plugins
+* `check_by_ssh`: added option to exit with an warning, if there is output on STDERR by @nafets in https://github.com/monitoring-plugins/monitoring-plugins/pull/1301
+* `check_by_ssh`: Add "-U" flag (#1123). by @archiecobbs in https://github.com/monitoring-plugins/monitoring-plugins/pull/1774
+* `check_by_ssh`: Let ssh decide if a host is valid, enables usage of ssh .config file by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1691
+* `check_curl`: Add an option to check_curl to verify the peer certificate & host using the system CA's by @bazzisoft in https://github.com/monitoring-plugins/monitoring-plugins/pull/1669
+* `check_curl`: fixed -ffollow for HTTP/2.0 (Fixes #1685): added major_version parsing to PicoHTTPParser by @andreasbaumann in https://github.com/monitoring-plugins/monitoring-plugins/pull/1742
+* `check_curl`: fixes check_curl: "CRITICAL - Cannot retrieve certificate subject." by @andreasbaumann in https://github.com/monitoring-plugins/monitoring-plugins/pull/1689
+* `check_curl`: fix if http header contains leading spaces by @sni in https://github.com/monitoring-plugins/monitoring-plugins/pull/1666
+* `check_curl`: Update check_curl.c to display a specific human-readable error message where possible by @bazzisoft in https://github.com/monitoring-plugins/monitoring-plugins/pull/1668
+* `check_curl`: verify certificates option should not force SSL to be used by @bazzisoft in https://github.com/monitoring-plugins/monitoring-plugins/pull/1688
+* `check_disk`: Description for -M was the wrong way around by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1746
+* `check_disk`: Fixing the stuff that is broken on btrfs by @waja in https://github.com/monitoring-plugins/monitoring-plugins/pull/1388
+* `check_disk`: Fix perfdata for big values for check disk by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1714
+* `check_disk_smb`: Add configfile feature by @Napsty in https://github.com/monitoring-plugins/monitoring-plugins/pull/1402
+* `check_disk_smb`: Add timeout by @cdruee in https://github.com/monitoring-plugins/monitoring-plugins/pull/1770
+* `check_dns`: Add --expect-nxdomain by @Jonny007-MKD in https://github.com/monitoring-plugins/monitoring-plugins/pull/1623
+* `check_dns`: split multiple IP addresses passed in one -a argument by @DerDakon in https://github.com/monitoring-plugins/monitoring-plugins/pull/1649
+* `check_file_age`: Make size parameter a little bit more intelligible by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1730
+* `check_fping`: Implements 'host-alive' mode (Closes. #1027) by @waja in https://github.com/monitoring-plugins/monitoring-plugins/pull/1740
+* `check_game`: Update Url to qstat by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1725
+* `check_http`: changed 'STATE_CRITICAL' to 'STATE_WARNING' for infinite loop by @xFuture603 in https://github.com/monitoring-plugins/monitoring-plugins/pull/1690
+* `check_http`: Increase regexp limit by @hydrapolic in https://github.com/monitoring-plugins/monitoring-plugins/pull/1566
+* `check_http`: Support http redirect by @waja in https://github.com/monitoring-plugins/monitoring-plugins/pull/1449
+* `check_icmp`: buffer offerflow by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1733
+* `check_icmp`: delay set_source_ip() until address_family is detected by @ghciv6 in https://github.com/monitoring-plugins/monitoring-plugins/pull/1735
+* `check_icmp`: Fix "Invalid Argument" from sendmsg() under FreeBSD 13.1 and "setsockopt failed" for TTL setting by @eriksejr in https://github.com/monitoring-plugins/monitoring-plugins/pull/1771
+* `check_icmp`: Fix pkt perfdata in check_host mode by @sjoegren in https://github.com/monitoring-plugins/monitoring-plugins/pull/1721
+* `check_ldap`: Allows check_ldap to read password from environment variable by @mullumaus in https://github.com/monitoring-plugins/monitoring-plugins/pull/1724
+* `check_load`: add LOAD prefix to load plugin by @haraldj in https://github.com/monitoring-plugins/monitoring-plugins/pull/1694
+* `check_load`: Display total and scaled load values if check_load scales the values by number of CPUs by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1778
+* `check_log`: Missing oldlog now aborts check_log by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1732
+* `check_mailq`: Add mailq -C option for config dir or config file by @leeclemens in https://github.com/monitoring-plugins/monitoring-plugins/pull/1490
+* `check_mailq`: Check mailq domain specific warnings by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1731
+* `check_mailq`: Fix regexp for nullmailer "mailq" output by @darksoul42 in https://github.com/monitoring-plugins/monitoring-plugins/pull/1493
+* `check_mysql`: fix segfaults with mysql-connector-c #1562 by @ghciv6 in https://github.com/monitoring-plugins/monitoring-plugins/pull/1644
+* `check_pgsql`: add --queryname parameter to check_pgsql by @datamuc in https://github.com/monitoring-plugins/monitoring-plugins/pull/1741
+* `check_ping`: Do not show RTA if no connection was possible by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1697
+* `check_ping`: understang ping6 output from iputils package by @glensc in https://github.com/monitoring-plugins/monitoring-plugins/pull/1412
+* `check_proc`: Fix check proc ps detection by @sni in https://github.com/monitoring-plugins/monitoring-plugins/pull/1712
+* `check_procs`: exchange needle and haystack in strstr() for proper st… by @wolfgangkarall in https://github.com/monitoring-plugins/monitoring-plugins/pull/1654
+* `check_smtp`: add -L flag to support LMTP (LHLO instead of HELO/EHLO). by @ghen2 in https://github.com/monitoring-plugins/monitoring-plugins/pull/1715
+* `check_snmp`: Added option for null zero length string exit codes by @FracKenA in https://github.com/monitoring-plugins/monitoring-plugins/pull/1496
+* `check_snmp`: fix performance thresholds when using multiple oids by @sni in https://github.com/monitoring-plugins/monitoring-plugins/pull/1722
+* `check_snmp` fix segfaults by @adrb in https://github.com/monitoring-plugins/monitoring-plugins/pull/1589
+* `check_snmp`: put the "c" (to mark a counter) after the perfdata value by @lausser in https://github.com/monitoring-plugins/monitoring-plugins/pull/1465
+* `check_swap`: fix parsing swap values by @sni in https://github.com/monitoring-plugins/monitoring-plugins/pull/1780
+* `check_swap`: Fix perfdata for check swap by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1707
+* `check_swap`: Fix unit for total in perfdata by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1779
+* `check_swap`: Handle cached swap by @mdavranche in https://github.com/monitoring-plugins/monitoring-plugins/pull/1642
+* `check_swap`: Small fix to threshold validation and style (indentation) fixes by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1723
+* `check_ups`: Fix possible overflow in check_ups by @phibos in https://github.com/monitoring-plugins/monitoring-plugins/pull/1727
+* `check_uptime`: Add option to report uptime in days instead of seconds by @amotl in https://github.com/monitoring-plugins/monitoring-plugins/pull/1750
+* `check_uptime`: Fix/improve output message "Uptime is ..." by @amotl in https://github.com/monitoring-plugins/monitoring-plugins/pull/1751
+
+### Multiple Plugins
+* `check_http`, `check_curl`: added --max-redirs=N option (feature #1684) by @andreasbaumann in https://github.com/monitoring-plugins/monitoring-plugins/pull/1744
+* `check_http`, `check_curl`: Enhancement --continue-after-certificate (backport from nagios-plugins) by @andreasbaumann in https://github.com/monitoring-plugins/monitoring-plugins/pull/1762
+* `check_http`, `check_curl`: Remove check_http and check_curl test which are somehow always failing by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1777
+* `check_log`, `check_oracle`, `check_sensors`: Several fixes shellcheck complaining about by @waja in https://github.com/monitoring-plugins/monitoring-plugins/pull/1459
+* `sslutils`: use chain from client certificates by @tobiaswiese in https://github.com/monitoring-plugins/monitoring-plugins/pull/1664
+
+### Non functional changes
+* Trivial source code whitespace formatting fixes to standard. by @ziesemer in https://github.com/monitoring-plugins/monitoring-plugins/pull/1424
+* docs: fix simple typo, conspicuosly -> conspicuously by @timgates42 in https://github.com/monitoring-plugins/monitoring-plugins/pull/1652
+* Migrate to GitHub actions by @jacobbaungard in https://github.com/monitoring-plugins/monitoring-plugins/pull/1686
+* Point to Icinga Exchange instead of dead Monitoring Exchange by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1737
+* github actions: fix check_users test case by @sni in https://github.com/monitoring-plugins/monitoring-plugins/pull/1713
+* Add CodeQL checks by @phibos in https://github.com/monitoring-plugins/monitoring-plugins/pull/1682
+* Fix some QL problems by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1729
+* Update CodeQL and update runner before installing by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1775
+* `check_disk`: Check disk compiler warnings by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1758
+* `check_disk`: Trivial printf fix and a little bit of code style by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1695
+* `check_http`: Docs: make -C obvious by @stblassitude in https://github.com/monitoring-plugins/monitoring-plugins/pull/1554
+* `check_ifoperstatus`: Re-attach a comment to where it actually belongs by @peternewman in https://github.com/monitoring-plugins/monitoring-plugins/pull/1699
+* `check_ircd`: Restrict the nickname length of the test user for check_ircd by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1710
+* `check_load`: Check load compiler warnings by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1759
+* `check_log` Modernize check log by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1692
+* `check_mailq`: remove duplicate W=i/C=i args in check_mailq.pl by @ichdasich in https://github.com/monitoring-plugins/monitoring-plugins/pull/1755
+* `check_ntp`: Check ntp remove unused variables by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1781
+* `check_pgsql`: Using snprintf which honors the buffers size and guarantees null temination. (Closes: #1601) by @waja in https://github.com/monitoring-plugins/monitoring-plugins/pull/1663
+* `check_procs`: Fix double percentage sign in usage by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1743
+* `check_sensors.sh`: Make shellcheck happier by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1679
+* `check_snmp`: Fixed option description authpassword -> authpasswd + whitespaces by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1676
+* `check_swap`: Check swap compiler warnings by @RincewindsHat in https://github.com/monitoring-plugins/monitoring-plugins/pull/1756
+
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-2-3-3.md b/web/input/news/release-2-3-3.md
new file mode 100644
index 0000000..a87b07a
--- /dev/null
+++ b/web/input/news/release-2-3-3.md
@@ -0,0 +1,59 @@
+title: Version 2.3.3 Released
+author: Jan Wagner
+date: 2023-02-02
+---
+
+The Monitoring Plugins Development Team is proud to announce version 2.3.3 of
+the Monitoring Plugins! This release comes with various fixes provided by more
+than 16 contributors. Many thanks to all of you!
+<end-of-teaser>
+
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+### Enhancements
+#### General
+* using PRId64 and PRIu64 instead of %ld directly
+#### Single Plugins
+* check_http: Make faster with larger files
+* check_snmp: add 'multiplier' to modify current value
+* check_http: Implement chunked encoding decoding
+* check_http/check_curl: add chunked encoding test
+* check_log: Added --exclude to exclude patterns
+* check_log: Add tests
+* check_disk: Clarify usage possibilites
+
+### Fixes
+#### General
+* fixed two PRId64 to PRIu64 in perfdata_uint64
+#### Single Plugins
+* check_pgsql: Removing is_pg_dbname alltogether,using postgres API.
+* check_http: Remove superflous CRLF in HTTP-Requests
+* check_curl: detect ipv6
+* check_icmp: fix parsing help/version long options
+* check_http: fix test plan
+* check_disk: Find accessible mount path if multiple are available
+* check_apt: Fix unknown escape sequence error output
+* check_curl: fix checking large bodys
+* check_snmp: Improve tests for check_snmp & multiply option
+* check_snmp: always apply format when applying multiplier
+* check_http: Use real booleans instead of ints
+* check_http: Document process_arguments a little bit better
+* check_http: Remove dead code
+* check_http: Fix several bug in the implementation of unchunking
+* check_http: Reformat a part to increase readability
+* check_apt: Put upgrade options in the root sections
+* check_apt: Fix comment
+* check_apt: Use real booleans
+* check_mailq: Fixing nullmailer regex
+* check_snmp: Fix regex matches
+* check_log: Fixed a bug when using --all
+* check_log: Cleaned up duplicated code in the args
+* check_http: Fix memory reallocation error in chunk decoding logic
+* check_http: Add space for ending NULL byte in array for chunked encoding
+
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-2-3-4.md b/web/input/news/release-2-3-4.md
new file mode 100644
index 0000000..5b68282
--- /dev/null
+++ b/web/input/news/release-2-3-4.md
@@ -0,0 +1,52 @@
+title: Version 2.3.4 Released
+author: Jan Wagner
+date: 2023-10-18
+---
+
+The Monitoring Plugins Development Team is proud to announce version 2.3.4 of
+the Monitoring Plugins! This release comes with various fixes provided by more
+than 30 contributors. Many thanks to all of you!
+<end-of-teaser>
+
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+### Enhancements
+#### General
+* Sync with the Gnulib code 668c0b8ffa
+* Set autoconf prerequisite version to 2.64
+* Remove sha1 and use sha256 in some parts of the plugin structure
+#### Single Plugins
+* check_curl: added --cookie-jar and doing proper cleanup of libcurl
+* check_curl: Include all IPs from getaddrinfo() in curl DNS cache
+* check_dhcp: Add dhcp rogue detection
+* check_disk: add ignore-missing option to return OK for missing fs
+* check_disk_smb: allow checking 0-sized resource (ex. IPC$)
+* check_disk: The options to include or exclude specific file systems now allow the usage of regex(7)
+* check_icmp: Add support to Jitter, MOS and Score
+* check_mysql: Detect running mysqldump and handle it more gracefully
+* check_procs: Implement --exclude-process to exclude specific processes
+* check_smtp: add new longoption --tls
+* check_smtp: Add option to prefix PROXY header
+* check_smtp: Add support for SMTP over TLS
+* check_smtp: Add support for SNI
+* check_snmp: Implement option to ignore mib file parsing errors
+* check_users: prefer systemd-logind over utmp
+
+### Fixes
+#### General
+* A lot of compiler warnings were fixed
+* Some code was refactored a little bit
+#### Single Plugins
+* check_disk: Display SI units correctly
+* check_ircd: use pack_sockaddr_in rather than hand-rolled
+* check_log/check_oracle/check_sensors: fixed the outputs of the help functionality
+* check_mysql: Add mysql_close to avoid spamming the server logs
+* check_smtp: add missing -r option in usage
+* check_snmp: disable multiplier when unused
+* check_wave: Use compile time determined path to snmpget
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-2-3-5.md b/web/input/news/release-2-3-5.md
new file mode 100644
index 0000000..ff280e2
--- /dev/null
+++ b/web/input/news/release-2-3-5.md
@@ -0,0 +1,26 @@
+title: Version 2.3.5 Released
+author: Jan Wagner
+date: 2023-10-18
+---
+
+The Monitoring Plugins Development Team is proud to announce version 2.3.5 of
+the Monitoring Plugins! This release comes just with a small fix preventing
+the tarball from being built. Sorry for this.
+
+<end-of-teaser>
+
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+### Fixes
+#### General
+* Include maxfd.h in lib Makefile
+
+Please also have a look into the changes from the [2.3.4 release][234release],
+you might have missed.
+
+[download]: /download.html
+[234release]: /news/release-2-3-4.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/news/release-2-4-0.md b/web/input/news/release-2-4-0.md
new file mode 100644
index 0000000..a1d111b
--- /dev/null
+++ b/web/input/news/release-2-4-0.md
@@ -0,0 +1,75 @@
+title: Version 2.4.0 Released
+author: Jan Wagner
+date: 2024-07-25
+---
+
+The Monitoring Plugins Development Team is proud to announce version 2.4.0 of
+the Monitoring Plugins! This release comes with various fixes provided by more
+than 12 contributors. Many thanks to all of you!
+<end-of-teaser>
+
+For the list of notable changes in this release, see below.
+
+You can get the tarball from our [download page][download].
+
+### Enhancements
+#### General
+* Use C99 booleans
+* Improve negate plugin helptext
+* Add new test function for percentage expressions
+#### Single Plugins
+* check_mailq: remove trailing whitespaces
+* check_mailq: unify tabs/spaces
+* check_oracle: Shellcheck fixes
+* check_ups: output ups.realpower if supported
+* check_disk: add -n short option for --ignore-missing
+* check_procs: Improve help text, mentioning excluded processes
+* check_procs: Generalise wording, remove mentioning of nrpe
+* check_curl: add haproxy protocol option
+* check_disk: increase alert precision
+* check_ircd: IPv6 support
+* check_nwstat: adds percentage used space
+* check_swap: Possibility to run check_swap without thresholds
+* check_ups: additional alarm conditions
+* check_http/check_curl: added a --regex-state option to change the state of a regex check
+
+### Fixes
+#### General
+* Fixes for -Wsign-compare
+* Fix logic in is_uint64_t to fix type-limit warning
+* Prevent -lcrypto from showing up in Makefile dependencies
+* Change irritating NULL assignment
+#### Single Plugins
+* check_dbi: Compiler warning for uninitialized variable
+* check_curl: Initialize pointer before usage
+* check_ntp: Initialize intermediate results in any case
+* check_tcp: Fixes an error with using the wrong type for a variable
+* check_mailq: exit on empty strings and exit early
+* check_users: Change option for sanity checking arguments to avoid segfault
+* check_users: Update help to properly show that thresholds are ranges
+* check_users: fix segfault
+* check_dbi: Fix compiler warning for uninitialized variable
+* check_curl: Initialize pointer before usage
+* check_ntp: Initialize intermediate results in any case
+* check_ntp_peer: Fixes for Wmaybe-unitialized and some restructuring
+* check_dns: Remove unused variable
+* check_disk: fix ignore-missing in combination with includes
+* check_procs: ignore our own children
+* check_http: Remove self assignment of a variable and add some comments
+* check_snmp: Remove unused variable
+* check_dhcp: Make implicit conversion explicit to dismiss warning
+* Ini Parser: Avoid freeing symbols from text section
+* check_icmp: keep performance data order in case of none-reachable hosts
+* check_swap: Change another fake boolean to a real one
+* check_swap: Rename type since *_t is reserved for C standard types
+* check_ssh: Fix a typo in "remote-protocol parameter
+* check_ssh: Handle non-alpha software versions
+* check_ssh: properly parse a delayed version control string
+* check_disk: Fail on missing arguments for --warning and --critical and fix a test case
+* check_disk: Use new test function for percentage expressions
+* check_load: remove unused code
+* check_curl/check_http: clarified format of POST data
+
+[download]: /download.html
+
+<!--% # vim:set filetype=markdown textwidth=78 joinspaces expandtab: # %-->
diff --git a/web/input/resources/fonts/bitter-v32-latin-700.woff b/web/input/resources/fonts/bitter-v32-latin-700.woff
new file mode 100644
index 0000000..c41c1af
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-700.woff
diff --git a/web/input/resources/fonts/bitter-v32-latin-700.woff2 b/web/input/resources/fonts/bitter-v32-latin-700.woff2
new file mode 100644
index 0000000..08115ec
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-700.woff2
diff --git a/web/input/resources/fonts/bitter-v32-latin-700italic.woff b/web/input/resources/fonts/bitter-v32-latin-700italic.woff
new file mode 100644
index 0000000..2f7509d
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-700italic.woff
diff --git a/web/input/resources/fonts/bitter-v32-latin-700italic.woff2 b/web/input/resources/fonts/bitter-v32-latin-700italic.woff2
new file mode 100644
index 0000000..2ae3d64
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-700italic.woff2
diff --git a/web/input/resources/fonts/bitter-v32-latin-italic.woff b/web/input/resources/fonts/bitter-v32-latin-italic.woff
new file mode 100644
index 0000000..4ed6fef
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-italic.woff
diff --git a/web/input/resources/fonts/bitter-v32-latin-italic.woff2 b/web/input/resources/fonts/bitter-v32-latin-italic.woff2
new file mode 100644
index 0000000..9f8a7a0
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-italic.woff2
diff --git a/web/input/resources/fonts/bitter-v32-latin-regular.woff b/web/input/resources/fonts/bitter-v32-latin-regular.woff
new file mode 100644
index 0000000..640650a
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-regular.woff
diff --git a/web/input/resources/fonts/bitter-v32-latin-regular.woff2 b/web/input/resources/fonts/bitter-v32-latin-regular.woff2
new file mode 100644
index 0000000..b9dd36d
--- /dev/null
+++ b/web/input/resources/fonts/bitter-v32-latin-regular.woff2
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-700.woff b/web/input/resources/fonts/source-code-pro-v22-latin-700.woff
new file mode 100644
index 0000000..201831d
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-700.woff
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-700.woff2 b/web/input/resources/fonts/source-code-pro-v22-latin-700.woff2
new file mode 100644
index 0000000..40ba215
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-700.woff2
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-700italic.woff b/web/input/resources/fonts/source-code-pro-v22-latin-700italic.woff
new file mode 100644
index 0000000..d525961
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-700italic.woff
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-700italic.woff2 b/web/input/resources/fonts/source-code-pro-v22-latin-700italic.woff2
new file mode 100644
index 0000000..4ab0c6b
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-700italic.woff2
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-italic.woff b/web/input/resources/fonts/source-code-pro-v22-latin-italic.woff
new file mode 100644
index 0000000..66af57d
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-italic.woff
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-italic.woff2 b/web/input/resources/fonts/source-code-pro-v22-latin-italic.woff2
new file mode 100644
index 0000000..1f4bc2a
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-italic.woff2
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-regular.woff b/web/input/resources/fonts/source-code-pro-v22-latin-regular.woff
new file mode 100644
index 0000000..597d27a
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-regular.woff
diff --git a/web/input/resources/fonts/source-code-pro-v22-latin-regular.woff2 b/web/input/resources/fonts/source-code-pro-v22-latin-regular.woff2
new file mode 100644
index 0000000..978a2a3
--- /dev/null
+++ b/web/input/resources/fonts/source-code-pro-v22-latin-regular.woff2
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-700.woff b/web/input/resources/fonts/source-sans-pro-v21-latin-700.woff
new file mode 100644
index 0000000..a6786d1
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-700.woff
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-700.woff2 b/web/input/resources/fonts/source-sans-pro-v21-latin-700.woff2
new file mode 100644
index 0000000..cd6bfd0
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-700.woff2
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-700italic.woff b/web/input/resources/fonts/source-sans-pro-v21-latin-700italic.woff
new file mode 100644
index 0000000..729bdee
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-700italic.woff
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-700italic.woff2 b/web/input/resources/fonts/source-sans-pro-v21-latin-700italic.woff2
new file mode 100644
index 0000000..b413356
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-700italic.woff2
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-italic.woff b/web/input/resources/fonts/source-sans-pro-v21-latin-italic.woff
new file mode 100644
index 0000000..f927419
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-italic.woff
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-italic.woff2 b/web/input/resources/fonts/source-sans-pro-v21-latin-italic.woff2
new file mode 100644
index 0000000..9448cd5
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-italic.woff2
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-regular.woff b/web/input/resources/fonts/source-sans-pro-v21-latin-regular.woff
new file mode 100644
index 0000000..db90a83
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-regular.woff
diff --git a/web/input/resources/fonts/source-sans-pro-v21-latin-regular.woff2 b/web/input/resources/fonts/source-sans-pro-v21-latin-regular.woff2
new file mode 100644
index 0000000..e49928e
--- /dev/null
+++ b/web/input/resources/fonts/source-sans-pro-v21-latin-regular.woff2
diff --git a/web/input/resources/mastodon.png b/web/input/resources/mastodon.png
new file mode 100644
index 0000000..e3ba80e
--- /dev/null
+++ b/web/input/resources/mastodon.png
diff --git a/web/input/resources/plugins.css b/web/input/resources/plugins.css
index c33d8c8..ab6198d 100644
--- a/web/input/resources/plugins.css
+++ b/web/input/resources/plugins.css
@@ -6,11 +6,131 @@
  * - See <http://colorschemedesigner.com/#3y21T--rOw0w0>.
  * - Additionally, we use the CSS color "dimgray" (#696969) for stuff like the
  *   breadcrumb navigation and the footer.
+ *
+ * Font faces:
+ *
+ * - CSS generated by <https://gwfh.mranftl.com/fonts>.
  */
 
-@import url("https://fonts.googleapis.com/css?family=Bitter");
-@import url("https://fonts.googleapis.com/css?family=Source+Sans+Pro");
-@import url("https://fonts.googleapis.com/css?family=Source+Code+Pro");
+/* bitter-regular - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Bitter';
+    font-style: normal;
+    font-weight: 400;
+    src: url('fonts/bitter-v32-latin-regular.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/bitter-v32-latin-regular.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* bitter-italic - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Bitter';
+    font-style: italic;
+    font-weight: 400;
+    src: url('fonts/bitter-v32-latin-italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/bitter-v32-latin-italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* bitter-700 - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Bitter';
+    font-style: normal;
+    font-weight: 700;
+    src: url('fonts/bitter-v32-latin-700.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/bitter-v32-latin-700.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* bitter-700italic - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Bitter';
+    font-style: italic;
+    font-weight: 700;
+    src: url('fonts/bitter-v32-latin-700italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/bitter-v32-latin-700italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-sans-pro-regular - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Sans Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: url('fonts/source-sans-pro-v21-latin-regular.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-sans-pro-v21-latin-regular.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-sans-pro-italic - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Sans Pro';
+    font-style: italic;
+    font-weight: 400;
+    src: url('fonts/source-sans-pro-v21-latin-italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-sans-pro-v21-latin-italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-sans-pro-700 - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Sans Pro';
+    font-style: normal;
+    font-weight: 700;
+    src: url('fonts/source-sans-pro-v21-latin-700.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-sans-pro-v21-latin-700.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-sans-pro-700italic - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Sans Pro';
+    font-style: italic;
+    font-weight: 700;
+    src: url('fonts/source-sans-pro-v21-latin-700italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-sans-pro-v21-latin-700italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-code-pro-regular - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Code Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: url('fonts/source-code-pro-v22-latin-regular.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-code-pro-v22-latin-regular.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-code-pro-italic - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Code Pro';
+    font-style: italic;
+    font-weight: 400;
+    src: url('fonts/source-code-pro-v22-latin-italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-code-pro-v22-latin-italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-code-pro-700 - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Code Pro';
+    font-style: normal;
+    font-weight: 700;
+    src: url('fonts/source-code-pro-v22-latin-700.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-code-pro-v22-latin-700.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
+
+/* source-code-pro-700italic - latin */
+@font-face {
+    font-display: swap; /* Check https://developer.mozilla.org/en-US/docs/Web/CSS/@font-face/font-display for other options. */
+    font-family: 'Source Code Pro';
+    font-style: italic;
+    font-weight: 700;
+    src: url('fonts/source-code-pro-v22-latin-700italic.woff2') format('woff2'), /* Chrome 36+, Opera 23+, Firefox 39+ */
+         url('fonts/source-code-pro-v22-latin-700italic.woff') format('woff'); /* Chrome 5+, Firefox 3.6+, IE 9+, Safari 5.1+ */
+}
 
 body {
     font-family: "Source Sans Pro", sans-serif;
@@ -160,6 +280,26 @@ img.travis {
 }
 
 /*
+ * Dark scheme.
+ */
+
+@media (prefers-color-scheme: dark) {
+    /*
+     * Loosely based on:
+     *
+     * https://material.io/archive/guidelines/style/color.html#color-themes
+     */
+    body {
+        color: #eee;
+        background-color: #212121;
+    }
+
+    h1, h2, h3, h4, h5, h6 {
+        color: #eee;
+    }
+}
+
+/*
  * On narrow displays, replace the menu bar with a simple list of items, and
  * omit the GitHub ribbon.
  */
@@ -167,7 +307,7 @@ img.travis {
 @media (max-width: 45em) {
     div#menu {
         padding: 1em;
-        background-color: #fff;
+        background-color: inherit;
         border-bottom: 1px dotted #696969;
     }
 
@@ -178,7 +318,7 @@ img.travis {
 
     div#menu span#current {
         color: #5a95c7;
-        background-color: #fff;
+        background-color: inherit;
     }
 
     div#menu a {
diff --git a/web/input/resources/twitter.png b/web/input/resources/twitter.png
deleted file mode 100644
index 00178c9..0000000
--- a/web/input/resources/twitter.png
+++ /dev/null
diff --git a/web/input/team.md b/web/input/team.md
index ca5c374..c5a3149 100644
--- a/web/input/team.md
+++ b/web/input/team.md
@@ -9,6 +9,7 @@ The Monitoring Plugins are maintained by the following group of developers:
 * Holger Weiß *(Patch Review, Development, Team Lead)*
 * Jan Wagner *(Patch Review, Development)*
 * Sven Nierlein *(Patch Review, Development)*
+* Lorenz Kästle *(Patch Review, Development)*
 
 Previous team members:
 
diff --git a/web/macros.py b/web/macros.py
index df64a26..5536f3f 100644
--- a/web/macros.py
+++ b/web/macros.py
@@ -1,19 +1,19 @@
 import email.utils
+import math
 import os.path
 import time
 
-plugins_release = '2.3.1'
+plugins_release = '2.4.0'
 mib_release = '1.0.1'
 release_notes = 'news/release-%s.html' % plugins_release.replace('.', '-')
 site_url = 'https://www.monitoring-plugins.org/'
 feeds = """These project news articles are also available as an
 [RSS feed][rss]{: rel="alternate" type="application/rss+xml" }.  Additional
-stuff is posted to [Twitter][twitter], so you might want to [follow us][follow]
-there as well.
+stuff is posted to [Mastodon][mastodon], so you might want to follow us there as
+well.
 
 [rss]: rss.xml "RSS Feed"
-[twitter]: https://twitter.com/ "Twitter"
-[follow]: https://twitter.com/intent/follow?screen_name=monitorplugins "Follow Us"
+[mastodon]: https://fosstodon.org/@monitoringplugins "Mastodon"
 """
 
 page = {
@@ -68,9 +68,8 @@ def hook_postconvert_rss():
     desc = 'Announcements published by the Monitoring Plugins Development Team.'
     date = email.utils.formatdate()
     rss = _RSS % (title, link, desc, date, date, items)
-    fp = open(os.path.join(output, 'rss.xml'), 'w')
-    fp.write(rss)
-    fp.close()
+    with open(os.path.join(output, 'rss.xml'), 'w', encoding='utf-8') as fp:
+        fp.write(rss)
 
 #
 # News
@@ -80,7 +79,7 @@ def hook_preconvert_news():
     posts_per_page = 10
     posts = [p for p in pages if 'date' in p]
     posts.sort(key=lambda p: p.date, reverse=True)
-    n_news_pages = len(posts) / posts_per_page
+    n_news_pages = math.ceil(len(posts) / posts_per_page)
     if len(posts) % posts_per_page > 0:
         n_news_pages += 1
     for i, chunk in enumerate(next_news_chunk(posts, posts_per_page)):
@@ -108,7 +107,7 @@ def make_news_page(posts, current_index):
         teaser = ['# ' + title]
     for p in posts:
         source = list()
-        author = p.author.encode('ascii', 'xmlcharrefreplace')
+        author = p.author
         timestamp = time.strptime(p.date, '%Y-%m-%d')
         author_date = author + ', ' + time.strftime('%B %-e, %Y', timestamp)
         teaser.append('## %s' % p.title)
diff --git a/web/page.html b/web/page.html
index 989dd4c..ee36fb2 100644
--- a/web/page.html
+++ b/web/page.html
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="{{ __encoding__ }}"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
                       "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 
@@ -6,9 +6,10 @@
 
   <head>
     <title>Monitoring Plugins - {{ hx(page.title) }}</title>
-    <meta http-equiv="Content-Type" content="text/html; charset={{ __encoding__ }}" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="description" content="{{ hx(page.description) }}" />
     <meta name="keywords" content="{{ hx(page.keywords) }}" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <link href="rss.xml" rel="alternate" type="application/rss+xml" title="Monitoring Plugins News" />
     <link href="resources/plugins.css" rel="stylesheet" type="text/css" />
     <link href="resources/favicon.ico" rel="shortcut icon" type="image/x-icon" />
@@ -28,10 +29,11 @@
       <div id="menu">
         <div id="feed-buttons">
           <a
-           href="https://twitter.com/intent/follow?screen_name=monitorplugins"
-           title="Follow Us on Twitter"><img
-           src="resources/twitter.png"
-           alt="Twitter"
+           href="https://fosstodon.org/@monitoringplugins"
+           rel="me"
+           title="Find Us on Mastodon"><img
+           src="resources/mastodon.png"
+           alt="Mastodon"
            width="20"
            height="20"/></a><a
            href="rss.xml"