diff --git a/smc-tools.changes b/smc-tools.changes
index ee4ae50..2aacd51 100644
--- a/smc-tools.changes
+++ b/smc-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Jan 27 21:52:54 UTC 2021 - Mark Post <mpost@suse.com>
+
+- Added a BuildRequires for bash-completion-devel so that the
+  completion file for smc will be built and installed. (bsc#1181360)
+- Created a new sub-package, smc-tools-completion, to deliver the
+  bash completion files.
+- Replaced the "make" command with the %make_build macro according
+  to the recommendation from spec-cleaner.
+
 -------------------------------------------------------------------
 Mon Dec  7 22:10:32 UTC 2020 - Mark Post <mpost@suse.com>
 
diff --git a/smc-tools.spec b/smc-tools.spec
index 6721286..c01a6d5 100644
--- a/smc-tools.spec
+++ b/smc-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package smc-tools
 #
-# Copyright (c) 2018-2020 SUSE LLC
+# Copyright (c) 2018-2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,7 @@ URL:            https://www.ibm.com/developerworks/linux/linux390/smc-tools.html
 Source:         %{name}-%{version}.tar.gz
 Source1:        smc-tools-rpmlintrc
 
+BuildRequires:  bash-completion-devel
 BuildRequires:  libnl3-devel
 PreReq:         permissions
 
@@ -38,6 +39,18 @@ Converged Ethernet (RoCE) network.
 The tools provided in this package allow existing TCP applications
 to use a RoCE network without needing to make changes in them.
 
+%package completion
+Summary:        Bash completion for smc-tools
+Group:          System/Kernel
+
+Requires:       %{name}
+Requires:       bash-completion
+Supplements:    (%{name} and bash-completion)
+
+%description completion
+This package contains the files to enable command completion for the
+smc-tools package when running a bash shell.
+
 %prep
 %autosetup -p1
 
@@ -48,7 +61,7 @@ to use a RoCE network without needing to make changes in them.
 # parameters.
 MYCFLAGS=$(grep ^CFLAGS Makefile | head -n1 | cut -f2 -d=)
 MYCFLAGS+=" $(pkg-config --silence-errors --cflags libnl-genl-3.0)"
-make %{?_smp_mflags} V=1 CFLAGS="${MYCFLAGS} %{optflags}"
+%make_build CFLAGS="${MYCFLAGS} %{optflags}"
 
 %install
 %make_install V=1
@@ -92,4 +105,7 @@ rm -Rf "%{buildroot}%{_prefix}/lib64"
 %{_mandir}/man8/smcr.8%{?ext_man}
 %{_mandir}/man8/smcss.8%{?ext_man}
 
+%files completion
+%{_datadir}/bash-completion/completions/smc*
+
 %changelog