3 files changed, 6 insertions, 6 deletions
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index f19da0869..987838465 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -475,7 +475,7 @@ if (( ! $+_fs_any )); then
       'swidth[specify stripe width]:size'
     )
     ;;
-  freebsd*|dragonfly*)
+  *freebsd*|dragonfly*)
     _fs_any=(
       '(sync)async[do all I/O asynchronously]'
       'current[use current options on already mounted file system]'
@@ -630,7 +630,7 @@ if [[ "$service" = mount ]]; then
     deffs=hsfs
     typeops=-F
     ;;
-  freebsd*|dragonfly*)
+  *freebsd*|dragonfly*)
     args=( -s
       '(:)-a[mount all filesystems in fstab]'
       '-d[cause everything to be done except for the actual system call]'      
@@ -704,7 +704,7 @@ else
 	'*:dev or dir:->udevordir'
       )
     ;;
-    freebsd*|dragonfly*)
+    *freebsd*|dragonfly*)
       args=(
 	'(*)-a[unmount all mounted file systems]'
 	'-A[unmount all mounted file systems except the root]'
@@ -766,7 +766,7 @@ devordir)
   fi
 
   case "$OSTYPE" in
-  freebsd*|dragonfly*)
+  *freebsd*|dragonfly*)
     while read mline; do 
       case $mline[(w)1] in
 	\#* )
diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index 99870b405..36b579bc7 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -1,7 +1,7 @@
 #compdef sysctl
 
 case $OSTYPE in
-  freebsd[5-9].*|freebsd4.[4-9]*)
+  *freebsd[5-9].*|freebsd4.[4-9]*)
     local -a sysctlvars
     sysctlvars=( $(sysctl -aN) )
     _arguments -s -A "-*" \
diff --git a/Completion/Unix/Type/_locales b/Completion/Unix/Type/_locales
index e809667d1..a449ebe16 100644
--- a/Completion/Unix/Type/_locales
+++ b/Completion/Unix/Type/_locales
@@ -4,7 +4,7 @@ local expl locales
 
 if (( $+commands[locale] )); then
   locales=( $(_call_program locales locale -a) )
-  [[ $OSTYPE = linux-gnu ]] && locales=( ${locales/utf8/UTF-8} )
+  [[ $OSTYPE = *-gnu ]] && locales=( ${locales/utf8/UTF-8} )
 else
   locales=( /usr/lib/locale/*(:t) )
 fi