diff --git a/libstoragemgmt.spec b/libstoragemgmt.spec
index d89623c..d790de6 100644
--- a/libstoragemgmt.spec
+++ b/libstoragemgmt.spec
@@ -16,7 +16,7 @@
 #
 
 
-%bcond_without test
+%bcond_with test
 
 %define libname %{name}1
 Name:           libstoragemgmt
@@ -32,7 +32,7 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libconfig-devel
 BuildRequires:  libtool
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  procps
 BuildRequires:  python-M2Crypto
 BuildRequires:  python-argparse
@@ -40,7 +40,6 @@ BuildRequires:  python-devel
 BuildRequires:  python-pyudev
 BuildRequires:  python-pywbem
 BuildRequires:  valgrind
-BuildRequires:  pkgconfig(bash-completion) >= 2.0
 BuildRequires:  pkgconfig(check)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libudev)
@@ -99,7 +98,7 @@ The python-%{name} package contains python client libraries as
 well as python framework support and open source plug-ins written in python.
 
 %package        -n python-%{name}-clibs
-Summary:        Python C extention for %{name}
+Summary:        Python C extension for %{name}
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}
 %py_requires
@@ -347,13 +346,13 @@ fi
 %{_mandir}/man1/lsmd.1%{ext_man}
 %{_mandir}/man5/lsmd.conf.5*
 %{_bindir}/lsmcli
-%{_datadir}/bash-completion/completions/lsmcli
 %{_bindir}/lsmd
 %{_bindir}/simc_lsmplugin
 %{_mandir}/man1/simc_lsmplugin.1%{ext_man}
 %{_unitdir}/libstoragemgmt.service
 %{_tmpfilesdir}/%{name}.conf
 %dir %{_sysconfdir}/lsm
+%config %{_sysconfdir}/bash_completion.d/lsmcli
 %config(noreplace) %{_sysconfdir}/lsm/lsmd.conf
 %dir %{_sysconfdir}/lsm/pluginconf.d
 %{_sbindir}/rclibstoragemgmt