diff --git a/godot.changes b/godot.changes
index 1f50c9e..80d5d52 100644
--- a/godot.changes
+++ b/godot.changes
@@ -7,9 +7,11 @@ Wed Feb 12 12:00:00 UTC 2020 - cunix@mail.de
 - "project_certs_fallback.patch" renamed to "certs_fallback.patch".
     Modified and adapted to Godot source code changes.
 
-- bash completion files "godot", "godot-headless", "godot-runner"
+- Bash completion files "godot", "godot-headless", "godot-runner"
     and "godot-server" added.
 
+- Package "godot-bash-completion" added.
+
 - Location of documentation in man page adjusted.
 
 - godot-rpmlintrc deleted with filter "no-manual-page-for-binary"
diff --git a/godot.spec b/godot.spec
index 992df24..737dda5 100644
--- a/godot.spec
+++ b/godot.spec
@@ -83,14 +83,14 @@ BuildRequires:  mbedtls-devel
 %endif
 %endif
 %endif
-Requires:       bash-completion
 Requires:       ca-certificates
 Recommends:     ca-certificates-mozilla
 Requires(post): update-desktop-files
 Requires(postun): update-desktop-files
-Suggests:       godot-headless = %{version}
-Suggests:       godot-runner = %{version}
-Suggests:       godot-server = %{version}
+Recommends:     %{name}-bash-completion
+Suggests:       %{name}-headless = %{version}
+Suggests:       %{name}-runner = %{version}
+Suggests:       %{name}-server = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 # The following "Provides: bundled()" and comments were taken from the 
@@ -163,9 +163,9 @@ platforms.
 %package headless
 Summary:        Headless version of Godot editor useful for command line
 Group:          Development/Tools/Other
-Requires:       bash-completion
 Requires:       ca-certificates
 Recommends:     ca-certificates-mozilla
+Suggests:       %{name}-bash-completion
 
 %description headless
 This package is the headless version of the Godot editor that is suited for 
@@ -174,9 +174,9 @@ exporting Godot games on the command line.
 %package runner
 Summary:        Shared binary to play games developed with the Godot engine
 Group:          Amusements/Games/Other
-Requires:       bash-completion
 Requires:       ca-certificates
 Recommends:     ca-certificates-mozilla
+Suggests:       %{name}-bash-completion
 
 %description runner
 This package contains a godot-runner binary for the Linux X11 platform,
@@ -186,9 +186,9 @@ by pointing to the location of the game's data package.
 %package server
 Summary:        Godot headless binary for servers
 Group:          Amusements/Games/Other
-Requires:       bash-completion
 Requires:       ca-certificates
 Recommends:     ca-certificates-mozilla
+Suggests:       %{name}-bash-completion
 
 %description server
 This package contains the headless binary for the Godot game engine
@@ -196,6 +196,21 @@ particularly suited for running dedicated servers.
 
 %endif
 
+%package bash-completion
+Summary:        Godot command line completion for Bash
+Group:          Amusements/Games/Other
+BuildArch:      noarch
+Requires:       bash-completion
+Supplements:    bash-completion
+Supplements:    %{name}
+Enhances:       %{name}-headless
+Enhances:       %{name}-runner
+Enhances:       %{name}-server
+
+%description bash-completion
+Bash command line completion support for %{name}, %{name}-headless,
+%{name}-runner and %{name}-server
+
 %prep
 %setup -q -n %{name}-%{version}-stable
 %patch0 -p1
@@ -287,7 +302,6 @@ scons %{build_args} platform=server tools=no target=release
 install -D -p -m 755 bin/%{name}.x11.opt.tools.%{__isa_bits} %{buildroot}%{_bindir}/%{name}
 
 install -D -p -m 644 misc/dist/linux/godot.6 %{buildroot}/%{_mandir}/man6/%{name}.6%{?ext_man}
-install -D -p -m 644 misc/dist/shell/godot.bash-completion %{buildroot}%{_datadir}/bash-completion/completions/%{name}
 install -D -p -m 644 icon.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
 install -D -p -m 644 icon.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 install -D -p -m 644 misc/dist/linux/org.godotengine.Godot.appdata.xml  %{buildroot}%{_datadir}/appdata/org.godotengine.Godot.appdata.xml
@@ -296,17 +310,20 @@ install -D -p -m 644 misc/dist/linux/org.godotengine.Godot.appdata.xml  %{buildr
 %if !0%{?faster_build}
 # Installing the headless editor
 install -D -p -m 755 bin/%{name}_server.x11.opt.tools.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-headless
-install -D -p -m 644 misc/dist/shell/godot-headless %{buildroot}%{_datadir}/bash-completion/completions/%{name}-headless
 
 # Installing the runner
 install -D -p -m 755 bin/%{name}.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-runner
-install -D -p -m 644 misc/dist/shell/godot-runner %{buildroot}%{_datadir}/bash-completion/completions/%{name}-runner
 
 # Installing the server
 install -D -p -m 755 bin/%{name}_server.x11.opt.%{__isa_bits} %{buildroot}%{_bindir}/%{name}-server
-install -D -p -m 644 misc/dist/shell/godot-server %{buildroot}%{_datadir}/bash-completion/completions/%{name}-server
 %endif
 
+# Installing bash-completion
+install -D -p -m 644 misc/dist/shell/godot.bash-completion %{buildroot}%{_datadir}/bash-completion/completions/%{name}
+install -D -p -m 644 misc/dist/shell/godot-headless %{buildroot}%{_datadir}/bash-completion/completions/%{name}-headless
+install -D -p -m 644 misc/dist/shell/godot-runner %{buildroot}%{_datadir}/bash-completion/completions/%{name}-runner
+install -D -p -m 644 misc/dist/shell/godot-server %{buildroot}%{_datadir}/bash-completion/completions/%{name}-server
+
 %fdupes -s %{buildroot}/%{_prefix}
 
 %files
@@ -320,7 +337,6 @@ install -D -p -m 644 misc/dist/shell/godot-server %{buildroot}%{_datadir}/bash-c
 %{_bindir}/%{name}
 %{_datadir}/appdata/org.godotengine.Godot.appdata.xml
 %{_datadir}/applications/org.godotengine.Godot.desktop
-%{_datadir}/bash-completion/completions/%{name}
 %{_datadir}/icons/hicolor/256x256/apps/%{name}.png
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man6/%{name}.6%{?ext_man}
@@ -330,19 +346,23 @@ install -D -p -m 644 misc/dist/shell/godot-server %{buildroot}%{_datadir}/bash-c
 %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md
 %doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md
 %{_bindir}/%{name}-headless
-%{_datadir}/bash-completion/completions/%{name}-headless
 
 %files runner
 %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md
 %doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md
 %{_bindir}/%{name}-runner
-%{_datadir}/bash-completion/completions/%{name}-runner
 
 %files server
 %license LICENSE.txt LOGO_LICENSE.md COPYRIGHT.txt thirdparty_README.md
 %doc AUTHORS.md CHANGELOG.md CONTRIBUTING.md DONORS.md README.md CODE_OF_CONDUCT.md
 %{_bindir}/%{name}-server
-%{_datadir}/bash-completion/completions/%{name}-server
 %endif
 
+%files bash-completion
+%license LICENSE.txt COPYRIGHT.txt
+%{_datadir}/bash-completion/completions/%{name}
+%{_datadir}/bash-completion/completions/%{name}-headless
+%{_datadir}/bash-completion/completions/%{name}-runner
+%{_datadir}/bash-completion/completions/%{name}-server
+
 %changelog