5 files changed, 11 insertions, 5 deletions
diff --git a/Completion/Unix/Command/_sysctl b/Completion/Unix/Command/_sysctl
index bda6a5ac2..2198d1b8a 100644
--- a/Completion/Unix/Command/_sysctl
+++ b/Completion/Unix/Command/_sysctl
@@ -13,8 +13,8 @@ case $OSTYPE in
       '(-o)-x[show opaques as well (entire values)]' \
       '(-a)*:sysctl variable:_multi_parts -i . sysctlvars'
   ;;
-  freebsd[0-4].*)
-    : ${(A)_cache_sysctlvars:=${${$(sysctl -A):#[^a-z]*}%%:*}}
+  freebsd[0-4].*|darwin*)
+    : ${(A)_cache_sysctlvars:=${${$(sysctl -A 2>/dev/null):#[^a-z]*}%%:*}}
     _arguments -s -A "-*" \
       '(-w -X *)-a[list all]' \
       '(-w -X *)-A[show all opaques (values suppressed)]' \
diff --git a/Completion/Unix/Command/_user_admin b/Completion/Unix/Command/_user_admin
index 5b467ab18..bf0908372 100644
--- a/Completion/Unix/Command/_user_admin
+++ b/Completion/Unix/Command/_user_admin
@@ -19,7 +19,7 @@ if [[ $service = user* ]]; then
     '(-D)-f+[specify inactive days]:inactive days'
     '(-D)-g+[initial group]:initial group:_groups'
     '(-D)-G+[supplementary groups]:supplementary groups:_groups -S,'
-    "(-D)-s+[shell]:shell:( $shells /dev/null )"
+    "(-D)-s+[shell]:shell:( $shells /bin/false )"
     '(-D -M)-m[create home directory]'
     '(-D)-u[uid]:uid'
     '(-D)-o[allow non unique uid]'
diff --git a/Completion/Unix/Command/_webbrowser b/Completion/Unix/Command/_webbrowser
index 6a82a4e9d..b0e6b1c21 100644
--- a/Completion/Unix/Command/_webbrowser
+++ b/Completion/Unix/Command/_webbrowser
@@ -1,3 +1,3 @@
-#compdef amaya arena chimera express grail gzilla hotjava mmm mozilla opera www xmosaic Mosaic
+#compdef amaya arena chimera express grail gzilla hotjava mmm mozilla opera www xmosaic Mosaic galeon
 
 _urls -f
diff --git a/Completion/Unix/Command/_wget b/Completion/Unix/Command/_wget
index eb940782d..95f2c8ade 100644
--- a/Completion/Unix/Command/_wget
+++ b/Completion/Unix/Command/_wget
@@ -74,6 +74,12 @@ _arguments -C -s \
   '(--cache -C)'{--cache=,-C+}'[(dis)allow server-cached data]:cache:(on off)' \
   '--htmlify=:htmlify:' \
   '--no:no:->noflags' \
+  '--cookies=[turn cookies on or off]:cookies:(on off)' \
+  '--load-cookies=[specify file to load cookies from]:cookie file:_files' \
+  '--save-cookies=[specify file to save cookies to]:cookie file:_files' \
+  '--no-http-keep-alive[disable HTTP keep-alive]' \
+  '--sslcertfile=[specify client certificate]:client certificate file:_files' \
+  '--sslcertkey=[specify keyfile for certificate]:keyfile:_files' \
   '*:url:_urls' && return 0
 
 case "$state" in
diff --git a/Completion/Unix/Type/_urls b/Completion/Unix/Type/_urls
index 7567f362c..63ab0e7c1 100644
--- a/Completion/Unix/Type/_urls
+++ b/Completion/Unix/Type/_urls
@@ -1,4 +1,4 @@
-#compdef curl galeon
+#compdef curl
 
 # Usage: _urls [-f]
 # Options: