diff --git a/completions/gcc b/completions/gcc
index d78e3e24..1d968255 100644
--- a/completions/gcc
+++ b/completions/gcc
@@ -47,7 +47,8 @@ _gcc()
     fi
 } &&
 complete -F _gcc gcc g++ c++ g77 gcj gpc
-[ $USERLAND = GNU -o $UNAME = Cygwin ] && \
+
+[[ $USERLAND == GNU || $UNAME == Cygwin ]] && \
 [ -n "${have:-}" ] && complete -F _gcc cc
 
 # Local variables:
diff --git a/completions/man b/completions/man
index 9e5cd3a8..8fd5fd6d 100644
--- a/completions/man
+++ b/completions/man
@@ -1,8 +1,7 @@
 # man(1) completion
 
-[ $USERLAND = GNU -o $UNAME = Darwin \
-  -o $UNAME = FreeBSD -o $UNAME = SunOS -o $UNAME = Cygwin \
-  -o $UNAME = OpenBSD ] &&
+[[ $USERLAND == GNU || $UNAME == Darwin || $UNAME == FreeBSD || \
+    $UNAME == SunOS || $UNAME == Cygwin || $UNAME == OpenBSD ]] &&
 _man()
 {
     local cur i prev sect manpath manext mansect uname