22 files changed, 20 insertions, 33 deletions
diff --git a/Src/Modules/cap.mdd b/Src/Modules/cap.mdd
index 4e7ee7216..905f7ca47 100644
--- a/Src/Modules/cap.mdd
+++ b/Src/Modules/cap.mdd
@@ -2,6 +2,6 @@ name=zsh/cap
 link=dynamic
 load=no
 
-autobins="cap getcap setcap"
+autofeatures="b:cap b:getcap b:setcap"
 
 objects="cap.o"
diff --git a/Src/Modules/clone.mdd b/Src/Modules/clone.mdd
index 8e4181bd4..47fca4ce8 100644
--- a/Src/Modules/clone.mdd
+++ b/Src/Modules/clone.mdd
@@ -2,6 +2,6 @@ name=zsh/clone
 link=dynamic
 load=no
 
-autobins="clone"
+autofeatures="b:clone"
 
 objects="clone.o"
diff --git a/Src/Modules/datetime.mdd b/Src/Modules/datetime.mdd
index 853b3bc79..0e5ffffb2 100644
--- a/Src/Modules/datetime.mdd
+++ b/Src/Modules/datetime.mdd
@@ -4,6 +4,6 @@ link=either
 load=no
 
 functions='Functions/Calendar/*'
-autobins="strftime"
+autofeatures="b:strftime p:EPOCHSECONDS"
 
 objects="datetime.o"
diff --git a/Src/Modules/example.mdd b/Src/Modules/example.mdd
index b3fcc92f7..3a00e3ed2 100644
--- a/Src/Modules/example.mdd
+++ b/Src/Modules/example.mdd
@@ -2,11 +2,6 @@ name=zsh/example
 link=dynamic
 load=no
 
-autobins="example"
-
-autoinfixconds="ex"
-autoprefixconds="len"
-autoparams="exint exstr exarr"
-automathfuncs="sum length"
+autofeatures="b:example C:ex c:len p:exint p:exstr p:exarr f:sum f:length"
 
 objects="example.o"
diff --git a/Src/Modules/files.mdd b/Src/Modules/files.mdd
index 18e69a45c..43b9f985a 100644
--- a/Src/Modules/files.mdd
+++ b/Src/Modules/files.mdd
@@ -2,6 +2,6 @@ name=zsh/files
 link=dynamic
 load=no
 
-autobins="chgrp chown ln mkdir mv rm rmdir sync"
+autofeatures="b:chgrp b:chown b:ln b:mkdir b:mv b:rm b:rmdir b:sync"
 
 objects="files.o"
diff --git a/Src/Modules/langinfo.mdd b/Src/Modules/langinfo.mdd
index 66c4cd452..d56898d42 100644
--- a/Src/Modules/langinfo.mdd
+++ b/Src/Modules/langinfo.mdd
@@ -3,6 +3,6 @@ name=zsh/langinfo
 link=`if test x$ac_cv_func_nl_langinfo; then echo either; else echo no; fi`
 load=no
 
-autoparams="langinfo"
+autofeatures="p:langinfo"
 
 objects="langinfo.o"
diff --git a/Src/Modules/mapfile.mdd b/Src/Modules/mapfile.mdd
index 0a96caa0a..5e5e2ff89 100644
--- a/Src/Modules/mapfile.mdd
+++ b/Src/Modules/mapfile.mdd
@@ -2,6 +2,6 @@ name=zsh/mapfile
 link=dynamic
 load=no
 
-autoparams="mapfile"
+autofeatures="p:mapfile"
 
 objects="mapfile.o"
diff --git a/Src/Modules/mathfunc.mdd b/Src/Modules/mathfunc.mdd
index 4d3dd934a..b19a17316 100644
--- a/Src/Modules/mathfunc.mdd
+++ b/Src/Modules/mathfunc.mdd
@@ -2,6 +2,4 @@ name=zsh/mathfunc
 link=dynamic
 load=no
 
-autobins="mathfunc"
-
 objects="mathfunc.o"
diff --git a/Src/Modules/parameter.mdd b/Src/Modules/parameter.mdd
index 083ee622d..d506dacb3 100644
--- a/Src/Modules/parameter.mdd
+++ b/Src/Modules/parameter.mdd
@@ -2,6 +2,6 @@ name=zsh/parameter
 link=either
 load=yes
 
-autoparams="parameters commands functions dis_functions funcstack functrace builtins dis_builtins reswords dis_reswords options modules dirstack history historywords jobtexts jobdirs jobstates nameddirs userdirs aliases dis_aliases galiases dis_galiases saliases dis_saliases"
+autofeatures="p:parameters p:commands p:functions p:dis_functions p:funcstack p:functrace p:builtins p:dis_builtins p:reswords p:dis_reswords p:options p:modules p:dirstack p:history p:historywords p:jobtexts p:jobdirs p:jobstates p:nameddirs p:userdirs p:aliases p:dis_aliases p:galiases p:dis_galiases p:saliases p:dis_saliases"
 
 objects="parameter.o"
diff --git a/Src/Modules/pcre.mdd b/Src/Modules/pcre.mdd
index 724911ca0..3e1579117 100644
--- a/Src/Modules/pcre.mdd
+++ b/Src/Modules/pcre.mdd
@@ -2,6 +2,6 @@ name=zsh/pcre
 link=`if test x$enable_pcre = xyes; then echo dynamic; else echo no; fi`
 load=no
 
-autobins="pcre_compile pcre_study pcre_match"
+autofeatures="b:pcre_compile b:pcre_study b:pcre_match"
 
 objects="pcre.o"
diff --git a/Src/Modules/regex.mdd b/Src/Modules/regex.mdd
index d025cabde..d532a8dd2 100644
--- a/Src/Modules/regex.mdd
+++ b/Src/Modules/regex.mdd
@@ -5,6 +5,4 @@ link=`if test x$ac_cv_func_regcomp = xyes && \
          test x$ac_cv_func_regfree = xyes; then echo dynamic; else echo no; fi`
 load=no
 
-autobins=""
-
 objects="regex.o"
diff --git a/Src/Modules/socket.mdd b/Src/Modules/socket.mdd
index 7147456d3..f405a92c3 100644
--- a/Src/Modules/socket.mdd
+++ b/Src/Modules/socket.mdd
@@ -3,4 +3,4 @@ link=dynamic
 load=no
 
 objects="socket.o"
-autobins="zsocket"
+autofeatures="b:zsocket"
diff --git a/Src/Modules/stat.mdd b/Src/Modules/stat.mdd
index 2534b1bdb..7be78e6ab 100644
--- a/Src/Modules/stat.mdd
+++ b/Src/Modules/stat.mdd
@@ -2,6 +2,6 @@ name=zsh/stat
 link=dynamic
 load=no
 
-autobins="stat"
+autofeatures="b:stat b:zstat"
 
 objects="stat.o"
diff --git a/Src/Modules/system.mdd b/Src/Modules/system.mdd
index 556f9f2ac..46f02d166 100644
--- a/Src/Modules/system.mdd
+++ b/Src/Modules/system.mdd
@@ -2,9 +2,7 @@ name=zsh/system
 link=dynamic
 load=no
 
-autobins="sysread syswrite syserror"
-
-autoparams="errnos"
+autofeatures="b:sysread b:syswrite b:syserror p:errnos"
 
 objects="system.o errnames.o"
 
diff --git a/Src/Modules/tcp.mdd b/Src/Modules/tcp.mdd
index 88874cd7d..69fd4d6bf 100644
--- a/Src/Modules/tcp.mdd
+++ b/Src/Modules/tcp.mdd
@@ -4,4 +4,4 @@ load=no
 functions='Functions/TCP/*'
 
 objects="tcp.o"
-autobins="ztcp"
+autofeatures="b:ztcp"
diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd
index a3ee39e02..f83cafef8 100644
--- a/Src/Modules/termcap.mdd
+++ b/Src/Modules/termcap.mdd
@@ -12,7 +12,6 @@ link='if test "x$ac_cv_func_tgetent" = xyes; then
 '
 load=yes
 
-autobins="echotc"
-autoparams="termcap"
+autofeatures="b:echotc p:termcap"
 
 objects="termcap.o"
diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd
index 7d88dfb27..ee6d39f08 100644
--- a/Src/Modules/terminfo.mdd
+++ b/Src/Modules/terminfo.mdd
@@ -12,7 +12,6 @@ link='if test "x$ac_cv_func_tigetflag" = xyes -a "x$ac_cv_header_curses_h" = xye
 '
 load=yes
 
-autobins="echoti"
-autoparams="terminfo"
+autofeatures="b:echoti p:terminfo"
 
 objects="terminfo.o"
diff --git a/Src/Modules/zftp.mdd b/Src/Modules/zftp.mdd
index 2614042b7..e96b367f9 100644
--- a/Src/Modules/zftp.mdd
+++ b/Src/Modules/zftp.mdd
@@ -3,7 +3,7 @@ link=dynamic
 load=no
 functions='Functions/Zftp/*'
 
-autobins="zftp"
+autofeatures="b:zftp"
 
 moddeps="zsh/net/tcp"
 
diff --git a/Src/Modules/zprof.mdd b/Src/Modules/zprof.mdd
index c6cf563fa..6cf7f2723 100644
--- a/Src/Modules/zprof.mdd
+++ b/Src/Modules/zprof.mdd
@@ -2,6 +2,6 @@ name=zsh/zprof
 link=dynamic
 load=no
 
-autobins="zprof"
+autofeatures="b:zprof"
 
 objects="zprof.o"
diff --git a/Src/Modules/zpty.mdd b/Src/Modules/zpty.mdd
index c6a9c5a7f..89857b782 100644
--- a/Src/Modules/zpty.mdd
+++ b/Src/Modules/zpty.mdd
@@ -2,6 +2,6 @@ name=zsh/zpty
 link=dynamic
 load=no
 
-autobins="zpty"
+autofeatures="b:zpty"
 
 objects="zpty.o"
diff --git a/Src/Modules/zselect.mdd b/Src/Modules/zselect.mdd
index b9ee28535..73948e5d8 100644
--- a/Src/Modules/zselect.mdd
+++ b/Src/Modules/zselect.mdd
@@ -3,4 +3,4 @@ link=dynamic
 load=no
 
 objects="zselect.o"
-autobins="zselect"
+autofeatures="b:zselect"
diff --git a/Src/Modules/zutil.mdd b/Src/Modules/zutil.mdd
index 587677dc2..8064814aa 100644
--- a/Src/Modules/zutil.mdd
+++ b/Src/Modules/zutil.mdd
@@ -6,4 +6,4 @@ moddeps="zsh/complete"
 
 objects="zutil.o"
 
-autobins="zformat zstyle zregexparse zparseopts"
+autofeatures="b:zformat b:zstyle b:zregexparse b:zparseopts"