diff --git a/grub2-change-bash-completion-dir.patch b/grub2-change-bash-completion-dir.patch
new file mode 100644
index 0000000..dc3d67e
--- /dev/null
+++ b/grub2-change-bash-completion-dir.patch
@@ -0,0 +1,13 @@
+diff --git a/util/bash-completion.d/Makefile.am b/util/bash-completion.d/Makefile.am
+index 136287c..2123a3c 100644
+--- a/util/bash-completion.d/Makefile.am
++++ b/util/bash-completion.d/Makefile.am
+@@ -6,7 +6,7 @@ EXTRA_DIST = $(bash_completion_source)
+ 
+ CLEANFILES = $(bash_completion_script) config.log
+ 
+-bashcompletiondir = $(sysconfdir)/bash_completion.d
++bashcompletiondir = $(datadir)/bash-completion/completions
+ bashcompletion_DATA = $(bash_completion_script)
+ 
+ $(bash_completion_script): $(bash_completion_source) $(top_builddir)/config.status
diff --git a/grub2.changes b/grub2.changes
index 61a3305..8ddefbd 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug  3 03:24:41 UTC 2023 - Gary Ching-Pang Lin <glin@suse.com>
+
+- Change the bash-completion directory (bsc#1213855)
+  * grub2-change-bash-completion-dir.patch 
+
 -------------------------------------------------------------------
 Wed Jul 26 03:04:25 UTC 2023 - Michael Chang <mchang@suse.com>
 
diff --git a/grub2.spec b/grub2.spec
index d945d03..7527b73 100644
--- a/grub2.spec
+++ b/grub2.spec
@@ -508,6 +508,8 @@ Patch982:       0002-kern-ieee1275-init-Extended-support-in-Vec5.patch
 Patch990:       0001-fs-ext2-Ignore-checksum-seed-incompat-feature.patch
 Patch991:       0001-fs-ext2-Ignore-the-large_dir-incompat-feature.patch
 
+Patch992:       grub2-change-bash-completion-dir.patch
+
 Requires:       gettext-runtime
 %if 0%{?suse_version} >= 1140
 %ifnarch s390x
@@ -1365,7 +1367,7 @@ fi
 %endif
 %dir /boot/%{name}
 %ghost %attr(600, root, root) /boot/%{name}/grub.cfg
-%{_sysconfdir}/bash_completion.d/grub
+%{_datadir}/bash-completion/completions/grub
 %config(noreplace) %{_sysconfdir}/default/grub
 %dir %{_sysconfdir}/grub.d
 %{_sysconfdir}/grub.d/README