diff --git a/ChangeLog b/ChangeLog
index 3b973d473..ac831ee9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,9 @@
  + Added Czech Republic holiday files (thanks to Tomas Cech).
  + All holiday files have been renamed to include a locale, rather than just a
    country code.  For example: holidays.en-US.rc.
+ + Now ships with an add-on script, update-holidays.pl, which contacts
+   http://holidata.net, and brings the installed holiday files up to date.
+ + Extension system now controlled by the 'extensions' configuration variable.
 
 # Tracked Features, sorted by ID.
  + Added feature #523 & #659, adding 'status' as a reportable field (thanks to
diff --git a/INSTALL b/INSTALL
index ad388dd5b..42269e4c7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -86,7 +86,7 @@ To uninstall taskwarrior, you need the Makefiles, so if you deleted them in
 step 7 above, they must first be regenerated by following steps [1], [2] and
 [3].  Then simply run:
 
-    $ sudo make uninstall TODO TODO TODO -- cmake doesn't include uninstall
+  $ sudo make uninstall TODO TODO TODO -- cmake doesn't include uninstall
 
 
 Taskwarrior Build Notes
diff --git a/NEWS b/NEWS
index a8a66d69d..f8ed52e70 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,7 @@ New configuration options in taskwarrior 2.0.0
   - The old 'curses' configuration variable is renamed to 'detection', but
     retains the original meaning, which is whether or not to auto-detect the
     dimensions of the terminal window.
+  - Extension system now controlled by the 'extensions' configuration variable.
 
 Newly deprecated features in taskwarrior 2.0.0
 
diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in
index 655bb7adc..ea0a224ab 100644
--- a/doc/man/taskrc.5.in
+++ b/doc/man/taskrc.5.in
@@ -349,6 +349,11 @@ Taskwarrior supports command aliases.  This alias provides an alternate name
 any of the commands.  Several commands you may use are actually aliases -
 the 'history' report, for example, or 'export'.
 
+.SS EXTENSIONS
+.TP
+.B extensions=on
+Enables the extension system.  Defaults to on.
+
 .SS DATES
 
 .TP
@@ -488,7 +493,7 @@ of the holidays is also shown.  If set to sparse only the days are color-coded
 and no details on the holidays will be displayed. The displaying of holidays is
 turned off by setting the variable to none.  The default value is "none".
 
-.SS Journal entries
+.SS JOURNAL ENTRIES
 
 .TP
 .B journal.time=no
@@ -511,7 +516,7 @@ having set journal.time.
 When enabled, this setting causes a change log of each task to be displayed by
 the 'info' command.  Default value is "on".
 
-.SS Holidays
+.SS HOLIDAYS
 Holidays are entered either directly in the .taskrc file or via an include file
 that is specified in .taskrc.  For each holiday the name and the date is
 required to be given:
diff --git a/src/Config.cpp b/src/Config.cpp
index a0099cf55..8188f8a23 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -253,7 +253,7 @@ std::string Config::defaults =
   "list.all.projects=no                           # Include old project names in 'projects' command\n"
   "list.all.tags=no                               # Include old tag names in 'tags' command\n"
   "debug=no                                       # Display diagnostics\n"
-  "hooks=off                                      # Hook system master switch\n"
+  "extensions=off                                 # Extension system master switch\n"
   "fontunderline=yes                              # Uses underlines rather than -------\n"
   "shell.prompt=task>                             # Prompt used by the shell command\n"
   "\n"
diff --git a/src/command.cpp b/src/command.cpp
index 14c6a20e7..db8c5cecf 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1178,7 +1178,7 @@ int handleShow (std::string& outs)
       "nag next journal.time journal.time.start.annotation journal.info "
       "journal.time.stop.annotation project shadow.command shadow.file "
       "shadow.notify weekstart editor edit.verbose import.synonym.id import.synonym.uuid "
-      "complete.all.projects complete.all.tags search.case.sensitive hooks "
+      "complete.all.projects complete.all.tags search.case.sensitive extensions "
       "active.indicator tag.indicator recurrence.indicator recurrence.limit "
       "list.all.projects list.all.tags undo.style verbose rule.precedence.color "
       "merge.autopush merge.default.uri pull.default.uri push.default.uri "