diff --git a/completions/pkgtools b/completions/pkgtools
index 2b438efc..b2386ba1 100644
--- a/completions/pkgtools
+++ b/completions/pkgtools
@@ -1,7 +1,7 @@
 # bash completion for Slackware Linux pkgtools
 
-[ -f /etc/slackware-version ] &&
-{
+[ -f /etc/slackware-version ] || return
+
 
 have pkgtool &&
 _pkgtool()
@@ -123,5 +123,3 @@ _makepkg()
 
 have explodepkg &&
 complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg
-
-}
diff --git a/completions/rpm2tgz b/completions/rpm2tgz
index 23c70ac9..dca03f22 100644
--- a/completions/rpm2tgz
+++ b/completions/rpm2tgz
@@ -1,6 +1,7 @@
 # Slackware rpm2tgz completion.
 
-have rpm2tgz &&
+have rpm2tgz || return
+
 _rpm2tgz()
 {
     COMPREPLY=()
diff --git a/completions/sbopkg b/completions/sbopkg
index 698fdf18..c551e57f 100644
--- a/completions/sbopkg
+++ b/completions/sbopkg
@@ -1,6 +1,7 @@
 # bash completion for sbopkg tool
 
-have sbopkg &&
+have sbopkg || return
+
 _sbopkg()
 {
     COMPREPLY=()
diff --git a/completions/slackpkg b/completions/slackpkg
index 139e7edd..7fe7cd08 100644
--- a/completions/slackpkg
+++ b/completions/slackpkg
@@ -1,6 +1,7 @@
 # bash completion for slackpkg tool
 
-have slackpkg &&
+have slackpkg || return
+
 _slackpkg()
 {
     COMPREPLY=()