diff --git a/libguestfs.spec b/libguestfs.spec
index 68b6765..ea36c7c 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -56,6 +56,11 @@ Release:        0
 %bcond_with ruby_bindings
 %endif
 
+%if %suse_version >= 1230
+%bcond_without bash_completion
+%else
+%bcond_with bash_completion
+%endif
 # The following defines are overridden in the individual subpackages
 %define _configure_fuse --disable-fuse
 %define _configure_lua --disable-lua
@@ -97,6 +102,9 @@ BuildRequires:  attr-devel
 BuildRequires:  augeas-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
+%if %{with bash_completion}
+BuildRequires:  bash-completion >= 2.0
+%endif
 BuildRequires:  file-devel
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -739,6 +747,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -n guestfsd
 %defattr(-,root,root)
 %{udevrulesdir}
+%if %{with bash_completion}
+%{_datadir}/bash-completion
+%endif
 %{_sbindir}/guestfsd
 %{_mandir}/man8/*