3 files changed, 11 insertions, 13 deletions
diff --git a/Completion/User/.distfiles b/Completion/User/.distfiles
index caf25f120..b17ca6488 100644
--- a/Completion/User/.distfiles
+++ b/Completion/User/.distfiles
@@ -1,9 +1,9 @@
 DISTFILES_SRC='
     .distfiles
-    _a2ps _bunzip2 _bzip2 _chown _compress _configure _dd _dir_list _dvi
-    _exec_funcs _find _gdb _gprof _groups _gs _gs_name _gunzip _gv _gzip
-    _hosts _lynx _make _man _mh _nslookup _patch _pbm _pdf _perl_basepods
-    _perl_builtin_funcs _perl_modules _perldoc _ps _pspdf _rcs _rlogin _sh
-    _strip _stty _su _tar _tar_archive _tex _uncompress _urls _use_lo
-    _users _xargs
+    _a2ps _bison _bunzip2 _bzip2 _chown _compress _configure _cvs _dd
+    _dir_list _dvi _find _flex _gdb _gprof _groups _gs _gunzip _gv _gzip
+    _hosts _ispell _lynx _make _man _man.old _mh _mount _nslookup _patch
+    _pbm _pdf _perl_basepods _perl_builtin_funcs _perl_modules _perldoc _ps
+    _pspdf _rcs _rlogin _sh _socket _ssh _strip _stty _su _tar _tar_archive
+    _telnet _tex _tiff _uncompress _urls _use_lo _users _xargs _yodl _yp
 '
diff --git a/Completion/User/_man b/Completion/User/_man
index 8ae64e239..ebe9a432e 100644
--- a/Completion/User/_man
+++ b/Completion/User/_man
@@ -1,6 +1,6 @@
 #compdef man
 
-setopt localoptions rcexpandparam extendedglob
+setopt localoptions rcexpandparam
 
 local rep expl star approx
 
@@ -14,14 +14,12 @@ if [[ -n $_comp_correct ]]; then
   approx="(#a${_comp_correct})"
 fi
 
-# `sman' is the SGML manual directory for Solaris 7.
-
 if [[ $words[2] = (<->*|ln) ]]; then
   rep=(
-  $manpath/(sman|man|cat)${words[2]}/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t) )
+  $manpath/(man|cat)${words[2]}/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t:r) )
 else
-  rep=( $manpath/(sman|man|cat)*/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t) )
+  rep=( $manpath/(man|cat)*/${~approx}$PREFIX${~star}$SUFFIX.<->*(N:t:r) )
 fi
 
 _description expl 'manual page'
-(( $#rep )) && compadd "$expl[@]" - ${rep%%.[^.]##(.gz|)}
+(( $#rep )) && compadd "$expl[@]" - $rep
diff --git a/Completion/User/_patch b/Completion/User/_patch
index 2b6ad5f94..6be2afd62 100644
--- a/Completion/User/_patch
+++ b/Completion/User/_patch
@@ -24,7 +24,7 @@ _arguments -s \
   '(--ifdef)-D+:name:' \
   '(--version-control)-V+:version control style:(simple numbered existing)' \
   '(--prefix)-B+:backup path prefix:' \
-  '(--suffix)-b+:backup extension:' \
+  '(--suffix)-b:backup extension:' \
   '-Y+:backup basename prefix:_files' \
   '-z+:backup file suffix:(.bak)' \
   '-g+:NUM:' \