diff --git a/general/sysutils/bluez.xml b/general/sysutils/bluez.xml
index 3e2d318835..492db32c67 100644
--- a/general/sysutils/bluez.xml
+++ b/general/sysutils/bluez.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY bluez-download-http "&kernel-dl;/linux/bluetooth/bluez-&bluez-version;.tar.xz">
   <!ENTITY bluez-download-ftp  " ">
-  <!ENTITY bluez-md5sum        "00da01bebad0595ba6eb2de4c6990a63">
+  <!ENTITY bluez-md5sum        "d89a1c660eaf33ae360af93e3e2951bd">
   <!ENTITY bluez-size          "2.1 MB">
-  <!ENTITY bluez-buildsize     "142 MB (with tests)">
+  <!ENTITY bluez-buildsize     "143 MB (with tests)">
   <!ENTITY bluez-time          "0.4 SBU (using parallelism=4; with tests)">
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d1fd4101ca..e3b6eff3a0 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,6 +41,16 @@
       </itemizedlist>
     </listitem>
     -->
+    <listitem>
+      <para>March 20th, 2022</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to bluez-5.64. Fixes
+          <ulink url="&blfs-ticket-root;16242">#16242</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>March 19th, 2022</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index 175e0f2d45..2bfbad6a01 100644
--- a/packages.ent
+++ b/packages.ent
@@ -289,7 +289,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY acpid-version                "2.0.33">
 <!ENTITY at-version                   "3.2.4">
 <!ENTITY autofs-version               "5.1.8">
-<!ENTITY bluez-version                "5.63">
+<!ENTITY bluez-version                "5.64">
 <!ENTITY bubblewrap-version           "0.6.1">
 <!ENTITY colord-version               "1.4.6">
 <!ENTITY cpio-version                 "2.13">
diff --git a/postlfs/filesystems/uefi-bootloaders/grub-setup.xml b/postlfs/filesystems/uefi-bootloaders/grub-setup.xml
index f78bc6f6d4..f793aa1749 100644
--- a/postlfs/filesystems/uefi-bootloaders/grub-setup.xml
+++ b/postlfs/filesystems/uefi-bootloaders/grub-setup.xml
@@ -118,15 +118,15 @@ mount -v -t vfat /dev/sdx1 /mnt/rescue</userinput></screen>
 <screen><literal>Processor type and features ---&gt;
   [*] EFI runtime service support                              [CONFIG_EFI]
   [*]   EFI stub support                                       [CONFIG_EFI_STUB]
-Firmware Drivers ---&gt;
-  EFI (Extensible Firmware Interface) Support ---&gt;
-    &lt; &gt; EFI Variable Support via sysfs                         [CONFIG_EFI_VARS]
-    [*] Export efi runtime maps to sysfs                       [CONFIG_EFI_RUNTIME_MAP]
 Enable the block layer ---&gt;
   Partition Types ---&gt;
     [*] Advanced partition selection                           [CONFIG_PARTITION_ADVANCED]
     [*] EFI GUID Partition support                             [CONFIG_EFI_PARTITION]
 Device Drivers ---&gt;
+  Firmware Drivers ---&gt;
+    EFI (Extensible Firmware Interface) Support ---&gt;
+      &lt; &gt; EFI Variable Support via sysfs                       [CONFIG_EFI_VARS]
+      [*] Export efi runtime maps to sysfs                     [CONFIG_EFI_RUNTIME_MAP]
   Graphics support ---&gt;
     Frame buffer Devices ---&gt;
       Support for frame buffer devices ---&gt;                    [CONFIG_FB]