diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31ce19c8..e57275a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 * evocheck: upstream release 21.10.4
 * evolinux-users + nagios-nrpe: Add support for php-fpm80 in lxc
+* listupgrade: old-kernel-removal version 21.10
 * mongodb: Deny the install on Debian 11 « Bullseye » when the version is unsupported
 * mongodb: Support version 5.0 (for buster)
 * mongodb: Allow to specify a mongodb version for buster & bullseye
diff --git a/listupgrade/files/old-kernel-autoremoval.sh b/listupgrade/files/old-kernel-autoremoval.sh
index ceed0b99..ce1c6002 100644
--- a/listupgrade/files/old-kernel-autoremoval.sh
+++ b/listupgrade/files/old-kernel-autoremoval.sh
@@ -4,13 +4,36 @@
 
 # fork by reg from /etc/kernel/postinst.d/apt-auto-removal script
 
-VERSION="21.06.3"
+VERSION="21.10"
+readonly VERSION
 
-set -e
+PROGNAME=$(basename "$0")
 
-# shellcheck disable=SC2046
-eval $(apt-config shell DPKG Dir::bin::dpkg/f)
-DPKG="${DPKG:-/usr/bin/dpkg}"
+show_version() {
+    cat <<END
+${PROGNAME} version ${VERSION}
+
+Copyright 2018-2021 Evolix <info@evolix.fr>,
+               Gregory Colpart <reg@evolix.fr>,
+               Romain Dessort <rdessort@evolix.fr>,
+               Ludovic Poujol <lpoujol@evolix.fr>,
+               Jérémy Lecour <jlecour@evolix.fr>
+               and others.
+
+${PROGNAME} comes with ABSOLUTELY NO WARRANTY.  This is free software,
+and you are welcome to redistribute it under certain conditions.
+See the GNU General Public Licence for details.
+END
+}
+show_help() {
+    cat <<END
+${PROGNAME} removes old kernels.
+
+Options
+ -h, --help                  print this message and exit
+     --version               print version and exit
+END
+}
 
 # Detect which one of apt/aptitude we should use.
 # shellcheck disable=SC2120
@@ -27,57 +50,103 @@ get_apt_binary() {
     fi
 }
 
-listupgrade_state_dir="${listupgrade_state_dir:-/var/lib/listupgrade}"
+main() {
+    specifc_kernel="$1"
 
-APT=$(get_apt_binary)
+    # shellcheck disable=SC2046
+    eval $(apt-config shell DPKG Dir::bin::dpkg/f)
+    DPKG="${DPKG:-/usr/bin/dpkg}"
 
-list="$("${DPKG}" -l | awk '/^[ih][^nc][ ]+(linux|kfreebsd|gnumach)-image-[0-9]+\./ && $2 !~ /-dbg(:.*)?$/ && $2 !~ /-dbgsym(:.*)?$/ { print $2,$3; }' \
-   | sed -e 's#^\(linux\|kfreebsd\|gnumach\)-image-##' -e 's#:[^:]\+ # #')"
-debverlist="$(echo "${list}" | cut -d' ' -f 2 | sort --unique --reverse --version-sort)"
+    listupgrade_state_dir="${listupgrade_state_dir:-/var/lib/listupgrade}"
 
-if [ -n "$1" ]; then
-    installed_version="$(echo "$list" | awk "\$1 == \"$1\" { print \$2;exit; }")"
-fi
-unamer="$(uname -r | tr '[:upper:]' '[:lower:]')"
-if [ -n "${unamer}" ]; then
-    running_version="$(echo "${list}" | awk "\$1 == \"${unamer}\" { print \$2;exit; }")"
-fi
-# ignore the currently running version if attempting a reproducible build
-if [ -n "${SOURCE_DATE_EPOCH}" ]; then
-    unamer=""
-    running_version=""
-fi
-latest_version="$(echo "${debverlist}" | sed -n 1p)"
-previous_version="$(echo "${debverlist}" | sed -n 2p)"
+    APT=$(get_apt_binary)
 
-debkernels="$(echo "${latest_version}
-${installed_version}
-${running_version}" | sort -u | sed -e '/^$/ d')"
-kernels="$( (echo "$1
-${unamer}"; for deb in ${debkernels}; do echo "${list}" | awk "\$2 == \"${deb}\" { print \$1; }"; done; ) \
-   | sed -e 's#\([\.\+]\)#\\\1#g' -e '/^$/ d' | sort -u|tr '\n' '|' | sed -e 's/|$//')"
+    list="$("${DPKG}" -l | awk '/^[ih][^nc][ ]+(linux|kfreebsd|gnumach)-image-[0-9]+\./ && $2 !~ /-dbg(:.*)?$/ && $2 !~ /-dbgsym(:.*)?$/ { print $2,$3; }' \
+    | sed -e 's#^\(linux\|kfreebsd\|gnumach\)-image-##' -e 's#:[^:]\+ # #')"
+    debverlist="$(echo "${list}" | cut -d' ' -f 2 | sort --unique --reverse --version-sort)"
+
+    if [ -n "${specifc_kernel}" ]; then
+        installed_version="$(echo "$list" | awk "\$1 == \"${specifc_kernel}\" { print \$2;exit; }")"
+    fi
+    unamer="$(uname -r | tr '[:upper:]' '[:lower:]')"
+    if [ -n "${unamer}" ]; then
+        running_version="$(echo "${list}" | awk "\$1 == \"${unamer}\" { print \$2;exit; }")"
+    fi
+    # ignore the currently running version if attempting a reproducible build
+    if [ -n "${SOURCE_DATE_EPOCH}" ]; then
+        unamer=""
+        running_version=""
+    fi
+    latest_version="$(echo "${debverlist}" | sed -n 1p)"
+    previous_version="$(echo "${debverlist}" | sed -n 2p)"
+
+    debkernels="$(echo "${latest_version}
+    ${installed_version}
+    ${running_version}" | sort -u | sed -e '/^$/ d')"
+    kernels="$( (echo "${specifc_kernel}
+    ${unamer}"; for deb in ${debkernels}; do echo "${list}" | awk "\$2 == \"${deb}\" { print \$1; }"; done; ) \
+    | sed -e 's#\([\.\+]\)#\\\1#g' -e '/^$/ d' | sort -u|tr '\n' '|' | sed -e 's/|$//')"
 
 
-echo "
-List of installed kernel packages:
-$list
+    echo "
+    List of installed kernel packages:
+    $list
 
-# Running kernel: ${running_version:-ignored} (${unamer:-ignored})
-# Last kernel: ${latest_version}
-# Previous kernel: ${previous_version}
-# Kernel versions list to keep:
-${debkernels}
+    # Running kernel: ${running_version:-ignored} (${unamer:-ignored})
+    # Last kernel: ${latest_version}
+    # Previous kernel: ${previous_version}
+    # Kernel versions list to keep:
+    ${debkernels}
 
-# Kernel packages (version part) to protect:
-${kernels}
-"
+    # Kernel packages (version part) to protect:
+    ${kernels}
+    "
 
-echo "BEFORE"
-dpkg -l | grep linux-image
+    echo "BEFORE"
+    dpkg -l | grep linux-image
 
-dpkg --get-selections | tr '\t' ' ' | cut -d" " -f1 | grep '^linux-image-[234]' | grep -v -E "(${kernels})" | xargs --no-run-if-empty ${APT} -o Dir::State::Lists="${listupgrade_state_dir}" -y purge
+    dpkg --get-selections | tr '\t' ' ' | cut -d" " -f1 | grep '^linux-image-[234]' | grep -v -E "(${kernels})" | xargs --no-run-if-empty ${APT} -o Dir::State::Lists="${listupgrade_state_dir}" -y purge
 
-echo "
-AFTER"
-dpkg -l | grep linux-image
-echo ""
+    echo "
+    AFTER"
+    dpkg -l | grep linux-image
+    echo ""
+
+}
+
+# Parse options
+# based on https://gist.github.com/deshion/10d3cb5f88a21671e17a
+while :; do
+    case $1 in
+        -h|-\?|--help)
+            show_help
+            exit 0
+            ;;
+        -V|--version)
+            show_version
+            exit 0
+            ;;
+        --)
+            # End of all options.
+            shift
+            break
+            ;;
+        -?*|[[:alnum:]]*)
+            # ignore unknown options
+            if [ "${QUIET}" != 1 ]; then
+                printf 'WARN: Unknown option (ignored): %s\n' "$1" >&2
+            fi
+            ;;
+        *)
+            # Default case: If no more options then break out of the loop.
+            break
+            ;;
+    esac
+
+    shift
+done
+
+set -e
+
+
+main "${@}"