diff --git a/8.40-1.tar.gz b/8.40-1.tar.gz
deleted file mode 100644
index 4cae317a95fbca6af9f24a7c8fde7b83a84d142c..0000000000000000000000000000000000000000
Binary files a/8.40-1.tar.gz and /dev/null differ
diff --git a/dist b/dist
new file mode 100644
index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533
--- /dev/null
+++ b/dist
@@ -0,0 +1 @@
+an8
diff --git a/download b/download
new file mode 100644
index 0000000000000000000000000000000000000000..5f4d0c6ed034a2cff138c00d62ec9bf2769bdd18
--- /dev/null
+++ b/download
@@ -0,0 +1 @@
+1005907b275d6d93368d045274537d86  8.40-1.tar.gz
diff --git a/grubby-bls b/grubby-bls
index 1a89d80a5c233afa2af0d51d43d8e5c2938a0550..360c6e81067599db8340609460eb9224810b4f3d 100755
--- a/grubby-bls
+++ b/grubby-bls
@@ -532,6 +532,20 @@ update_bls_fragment() {
 	fi
     done
 
+    if [[ $param = "ALL" ]] && [[ -n $remove_args || -n $add_args ]]; then
+	if [[ ! -f /etc/kernel/cmdline ]]; then
+	    # anaconda could pre-populate this file, but until then, most of
+	    # the time we'll just want the most recent one.  This is pretty
+	    # close to the current almost-correct behavior of falling back to
+	    # /proc/cmdline anyhow.
+	    echo "$(get_bls_args -1)" > /etc/kernel/cmdline
+	fi
+
+	read old_args < /etc/kernel/cmdline
+	local new_args="$(update_args "${old_args}" "${remove_args}" "${add_args}")"
+	echo "$new_args" > /etc/kernel/cmdline
+    fi
+
     update_grubcfg
 }
 
diff --git a/grubby.spec b/grubby.spec
index b9eae4cb916e2e8f2edb926c2cd94415a2aef5dc..0ed1620faccb378e6da251e092e46889c232cc22 100644
--- a/grubby.spec
+++ b/grubby.spec
@@ -1,8 +1,8 @@
-%define anolis_release .0.2
+%define anolis_release .0.1
 
 Name: grubby
 Version: 8.40
-Release: 42%{anolis_release}%{?dist}
+Release: 47%{anolis_release}%{?dist}
 Summary: Command line tool for updating BootLoaderSpec files
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -182,15 +182,31 @@ current boot environment.
 %{_mandir}/man8/*.8*
 
 %changelog
-* Mon Feb 21 2022 Weitao Zhou <zhouwt@linux.alibaba.com> 8.40-42.0.3
+* Tue Jan 03 2023 yangxiaoxuan <yangxiaoxuan@openanolis.org> - 8.40-47.0.1
+- Rebrand for Anolis OS
+- Support loongarch64
 - fix build error with gcc9.2
 - Fix gcc10 build issue
 
-* Tue Jan 25 2022 zhangwenlong <zhangwenlong@loongson.cn> - 8.40-42.0.2
-- Support loongarch64
+* Mon Oct 10 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-47
+- Backport fedora/rhel9 initial cmdline population
+- Resolves: #2129740
 
-* Wed Jan 12 2022 yangxiaoxuan <yangxiaoxuan@openanolis.org> - 8.40-42.0.1
-- Rebrand for Anolis OS
+* Thu Oct 06 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-46
+- Fix quoting of opts in grubby-bls
+- Resolves: #2129740
+
+* Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-44
+- Write to /etc/kernel/cmdline on non-s390x also
+- Resolves: #1978226
+
+* Thu Aug 11 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-44
+- Write to /etc/kernel/cmdline on s390x and only s390x
+- Resolves: #1978226
+
+* Fri Jun 03 2022 Robbie Harwood <rharwood@redhat.com> - 8.40-43
+- Additionally write to /etc/kernel/cmdline
+- Resolves: #1978226
 
 * Wed Jun 09 2021 Javier Martinez Canillas <javierm@redhat.com> - 8.40-42
 - grubby-bls: expand only the kernelopts variable