diff --git a/bin/generate-zbm b/bin/generate-zbm
index 3bbeb8955..3257c5176 100755
--- a/bin/generate-zbm
+++ b/bin/generate-zbm
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '2.2.1';
+our $VERSION = '2.2.2';
 
 use Getopt::Long qw(:config no_ignore_case auto_version);
 use Pod::Usage   qw(pod2usage);
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index f696f1364..119caaa15 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## ZFSBootMenu v2.2.2 (2023-10-24)
+
+ZFSBootMenu v2.2.2 contains no runtime changes relative to v2.2.1. The creation of UEFI bundles (so-called unified kernel images, or UKIs) in `generate-zbm` has been updated to properly support newer UEFI stub loaders that were known to cause boot failures in the past. These changes were inspired by similar functionality in mkinitcpio and the `ukify` utility included with systemd.
+
+### Significant commits in this release
+* 9424356 - bin/generate-zbm: add .linux section last (Zach Dykstra)
+* 36a0a66 - bin/generate-zbm: use mkinitcpio method to calc offsets (Zach Dykstra)
+
 ## ZFSBootMenu v2.2.1 (2023-10-13)
 
 ZFSBootMenu v2.2.1 offers a few minor bug fixes over the prior release. More significantly, the build-container images and release assets for this version include OpenZFS 2.2.0 to provide access to upgraded pools.
diff --git a/docs/conf.py b/docs/conf.py
index 7a1d6ea59..6e4073b10 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -10,7 +10,7 @@
 author = 'ZFSBootMenu Team'
 man_author = f'{author} <https://github.com/zbm-dev/zfsbootmenu>'
 copyright = f'2019 Zach Dykstra, 2020-2023 {author}'
-release = '2.2.1'
+release = '2.2.2'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration
diff --git a/docs/man/dist/man5/generate-zbm.5 b/docs/man/dist/man5/generate-zbm.5
index 45bac3dce..c8895a662 100644
--- a/docs/man/dist/man5/generate-zbm.5
+++ b/docs/man/dist/man5/generate-zbm.5
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GENERATE-ZBM" "5" "2023-10-13" "" "ZFSBootMenu"
+.TH "GENERATE-ZBM" "5" "2023-10-24" "" "ZFSBootMenu"
 .SH NAME
 generate-zbm \- configuration file for generate-zbm
 .SH SYNOPSIS
diff --git a/docs/man/dist/man7/zfsbootmenu.7 b/docs/man/dist/man7/zfsbootmenu.7
index cd302d0f5..a3d986c35 100644
--- a/docs/man/dist/man7/zfsbootmenu.7
+++ b/docs/man/dist/man7/zfsbootmenu.7
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ZFSBOOTMENU" "7" "2023-10-13" "" "ZFSBootMenu"
+.TH "ZFSBOOTMENU" "7" "2023-10-24" "" "ZFSBootMenu"
 .SH NAME
 zfsbootmenu \- System Integration
 .SH SYNOPSIS
diff --git a/docs/man/dist/man8/generate-zbm.8 b/docs/man/dist/man8/generate-zbm.8
index e87d0cb92..05446f5d9 100644
--- a/docs/man/dist/man8/generate-zbm.8
+++ b/docs/man/dist/man8/generate-zbm.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "GENERATE-ZBM" "8" "2023-10-13" "" "ZFSBootMenu"
+.TH "GENERATE-ZBM" "8" "2023-10-24" "" "ZFSBootMenu"
 .SH NAME
 generate-zbm \- ZFSBootMenu initramfs generator
 .SH SYNOPSIS
diff --git a/docs/man/dist/man8/zbm-kcl.8 b/docs/man/dist/man8/zbm-kcl.8
index 9463513fd..40b739c42 100644
--- a/docs/man/dist/man8/zbm-kcl.8
+++ b/docs/man/dist/man8/zbm-kcl.8
@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ZBM-KCL" "8" "2023-10-13" "" "ZFSBootMenu"
+.TH "ZBM-KCL" "8" "2023-10-24" "" "ZFSBootMenu"
 .SH NAME
 zbm-kcl \- manipulate kernel command lines for boot environments and EFI executables
 .SH SYNOPSIS