diff --git a/ChangeLog b/ChangeLog
index 13a62fdfa..3562b1379 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-09-27  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* 36663: Src/mkmakemod.sh, Src/zsh.mdd: replace obsolete
+	"autobins" commentary with "autofeatures"
+
 	* 36661: Src/Modules/curses.mdd: replace obsolete "autobins"
 	setting with "autofeatures"
 
diff --git a/Src/mkmakemod.sh b/Src/mkmakemod.sh
index 002160910..3ccf9c5e5 100644
--- a/Src/mkmakemod.sh
+++ b/Src/mkmakemod.sh
@@ -21,12 +21,8 @@
 #   moddeps         modules on which this module depends (default none)
 #   nozshdep        non-empty indicates no dependence on the `zsh/main' pseudo-module
 #   alwayslink      if non-empty, always link the module into the executable
-#   autobins        builtins defined by the module, for autoloading
-#   autoinfixconds  infix condition codes defined by the module, for
-#                   autoloading (without the leading `-')
-#   autoprefixconds like autoinfixconds, but for prefix condition codes
-#   autoparams      parameters defined by the module, for autoloading
-#   automathfuncs   math functions defined by the module, for autoloading
+#   autofeatures    features defined by the module, for autoloading
+#   autofeatures_emu As autofeatures, but for non-zsh emulation modes
 #   objects         .o files making up this module (*must* be defined)
 #   proto           .syms files for this module (default generated from $objects)
 #   headers         extra headers for this module (default none)
@@ -189,7 +185,7 @@ if $first_stage; then
     for mddname in $here_mddnames; do
 
 	unset name moddeps nozshdep alwayslink hasexport
-	unset autobins autoinfixconds autoprefixconds autoparams automathfuncs
+	unset autofeatures autofeatures_emu
 	unset objects proto headers hdrdeps otherincs
 	. $top_srcdir/$the_subdir/${mddname}.mdd
 	q_name=`echo $name | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index c2e59c910..86dd58866 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -7,7 +7,7 @@ functions='Functions/Chpwd/* Functions/Exceptions/* Functions/Misc/* Functions/M
 nozshdep=1
 alwayslink=1
 
-# autobins not specified because of alwayslink
+# autofeatures not specified because of alwayslink
 
 objects="builtin.o compat.o cond.o context.o \
 exec.o glob.o hashtable.o hashnameddir.o \