11 files changed, 23 insertions, 62 deletions

diff --git a/Completion/.distfiles b/Completion/.distfiles
index cf937f463..cb8fda0bd 100644
--- a/Completion/.distfiles
+++ b/Completion/.distfiles
@@ -1,3 +1,4 @@
 DISTFILES_SRC='
-    .cvsignore .distfiles README
+.distfiles
+.cvsignore   README       compaudit    compdump     compinit     compinstall
 '
diff --git a/Completion/AIX/.distfiles b/Completion/AIX/.distfiles
index 37f732f6c..9e276f99b 100644
--- a/Completion/AIX/.distfiles
+++ b/Completion/AIX/.distfiles
@@ -1,5 +1,3 @@
 DISTFILES_SRC='
-    .distfiles
-    _floppy _lscfg _lsdev _lslv _lspv _lsvg _object_classes
-    _logical_volumes _physical_volumes _smit _volume_groups
+.distfiles
 '
diff --git a/Completion/Base/.distfiles b/Completion/Base/.distfiles
index c96732a76..1803cbcd2 100644
--- a/Completion/Base/.distfiles
+++ b/Completion/Base/.distfiles
@@ -1,8 +1,4 @@
 DISTFILES_SRC='
-    .distfiles 
-    _arg_compile _arguments _brace_parameter _cache_invalid _combination
-    _command_names _condition _default _describe _equal _first _in_vared
-    _jobs _math _parameter _precommand _redirect _regex_arguments
-    _retrieve_cache _store_cache _subscript _tilde _value _values
-    _sub_commands
+.distfiles
+_arguments~     _describe~      _sub_commands~  _tilde~
 '
diff --git a/Completion/Bsd/.distfiles b/Completion/Bsd/.distfiles
index aef7ff380..9e276f99b 100644
--- a/Completion/Bsd/.distfiles
+++ b/Completion/Bsd/.distfiles
@@ -1,4 +1,3 @@
 DISTFILES_SRC='
-    .distfiles
-    _bsd_pkg _cvsup _kld
+.distfiles
 '
diff --git a/Completion/Builtins/.distfiles b/Completion/Builtins/.distfiles
index d2878d165..472a6d90a 100644
--- a/Completion/Builtins/.distfiles
+++ b/Completion/Builtins/.distfiles
@@ -1,8 +1,5 @@
 DISTFILES_SRC='
-    .distfiles
-    _aliases _arrays _autoload _bg_jobs _bindkey _builtin _cd _command
-    _compdef _disable _echotc _emulate _enable _fc _fg_jobs _functions
-    _hash _kill _limits _nothing _pids _popd _print _read _sched _set
-    _setopt _source _stat _trap _unhash _unsetopt _vars _vars_eq _wait
-    _which _zcompile _zftp _zle _zmodload _zpty _signals _zstyle
+.distfiles
+_aliases~  _hash~     _popd~     _which~
+_fc~       _pids~     _source~   _zftp~
 '
diff --git a/Completion/Commands/.distfiles b/Completion/Commands/.distfiles
index bb391269c..efdb5b94f 100644
--- a/Completion/Commands/.distfiles
+++ b/Completion/Commands/.distfiles
@@ -1,6 +1,4 @@
 DISTFILES_SRC='
-    .distfiles
-    _bash_completions _complete_debug _correct_filename _correct_word
-    _expand_word _history_complete_word _read_comp _most_recent_file
-    _complete_help _next_tags _complete_tag _generic
+.distfiles
+_history_complete_word~
 '
diff --git a/Completion/Core/.distfiles b/Completion/Core/.distfiles
index 046eb3730..aa1e1bd7e 100644
--- a/Completion/Core/.distfiles
+++ b/Completion/Core/.distfiles
@@ -1,11 +1,6 @@
 DISTFILES_SRC='
-    .distfiles
-    _all_labels _all_matches _alternative _approximate
-    _call _compalso _complete _correct _description _expand _expand_alias
-    _file_descriptors _files _funcall _history _ignored _list _main_complete
-    _match _menu _multi_parts _message _next_label _normal _oldlist _options
-    _parameters _path_files _prefix _requested _sep_parts
-    _set_options _setup _tags
-    _unset_options _wanted
-    compaudit compdump compinit compinstall
+.distfiles
+_all_labels~     _expand~         _next_label~     _setup~
+_approximate~    _main_complete~  _normal~         compinit~
+_expand_alias~   _multi_parts~    _path_files~
 '
diff --git a/Completion/Debian/.distfiles b/Completion/Debian/.distfiles
index b2064b60c..9e276f99b 100644
--- a/Completion/Debian/.distfiles
+++ b/Completion/Debian/.distfiles
@@ -1,5 +1,3 @@
 DISTFILES_SRC='
-    .distfiles
-    _apt-get _deb_packages
+.distfiles
 '
-
diff --git a/Completion/Linux/.distfiles b/Completion/Linux/.distfiles
index 6bf933087..09fa19330 100644
--- a/Completion/Linux/.distfiles
+++ b/Completion/Linux/.distfiles
@@ -1,6 +1,4 @@
 DISTFILES_SRC='
-    .distfiles
-    _rpm
-	_apm
+.distfiles
+_apm
 '
-
diff --git a/Completion/User/.distfiles b/Completion/User/.distfiles
index 4411fb28e..d7f5d74f2 100644
--- a/Completion/User/.distfiles
+++ b/Completion/User/.distfiles
@@ -1,20 +1,5 @@
 DISTFILES_SRC='
-    .distfiles
-    _a2ps _apachectl _archie _arp _bison _bzip2
-    _chown _compress _configure _cvs
-    _dd _dict _diff _diff_options _dir_list _dirs _domains _dvi
-    _enscript _find _finger _fakeroot _fetchmail _flex
-    _gcc _gdb  _getconf _gprof _grep _groups _gs _gv _gzip
-    _hosts _imagemagick _iconv _init_d _ispell
-    _java _joe _killall _look _lp _ls _lynx _lzop
-    _mailboxes _make _man _mere _mh _mount _mutt _my_accounts _mysql_utils
-    _ncftp _nedit _netscape _newsgroups _nslookup _other_accounts
-    _pack _patch _pbm _pdf _perl _perl_basepods _perl_builtin_funcs
-    _perl_modules _perldoc _ports _prcs _printers _prompt _ps _pspdf
-    _psutils _rcs _rlogin
-    _sh _slrn _socket _ssh _strip _stty _su _sudo
-    _tar _tar_archive _telnet _tex _texi _tiff _tilde_files _tin
-    _urls _use_lo _user_at_host _users _users_on
-    _w3m _webbrowser _wget _whereis _whois _xargs _yodl _yp
-    _zcat _zdump _zip
+.distfiles
+_cpio~         _make~         _mysql_utils~  _rlogin~       _urls~
+_init_d~       _man~          _nedit~        _telnet~
 '
diff --git a/Completion/X/.distfiles b/Completion/X/.distfiles
index d609d6cb6..8482e942a 100644
--- a/Completion/X/.distfiles
+++ b/Completion/X/.distfiles
@@ -1,8 +1,4 @@
 DISTFILES_SRC='
-    .distfiles
-    _x_arguments _x_borderwidth _x_color _x_colormapid _x_cursor _x_display
-    _x_extension _x_font _x_geometry _x_keysym _x_locale _x_modifier
-    _x_name _x_resource _x_selection_timeout _x_title _x_window
-    _xauth _xdvi _xfig
-    _xmodmap _xrdb _xset _xt_arguments _xt_session_id _xterm _xutils _xv _xwit
+.distfiles
+_x_arguments~   _xt_arguments~
 '