diff --git a/NEWS.md b/NEWS.md
index 39d34afb..9b350478 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,11 @@
 
 ## Version 4.2.0 - TBA
 
+* Allow setting algorithm per-pool and initial implementation of kernel
+  hot-swapping (by _mrbrdo_). Use options `pool-algorithm` (in config
+  file or in CLI) or `algorithm` (config-only).
+
+
 ## Version 4.1.242 - 7th April 2014
 
 * There are now two mailing lists (on SourceForge), see `README.md`.
diff --git a/doc/configuration.md b/doc/configuration.md
index 1f6d3dbb..41a51998 100644
--- a/doc/configuration.md
+++ b/doc/configuration.md
@@ -10,6 +10,9 @@
 Allows choosing between the few mining algorithms for incompatible
 cryptocurrencies.
 
+If specified in a pool section in the configuration file, sets the
+option for that pool only. Otherwise sets the default.
+
 *Argument:* string
 
 *Default:* `scrypt`
@@ -23,22 +26,30 @@ cryptocurrencies.
 * everything else - currently defaults to `scrypt`, subject to change
   without warning.
 
+
 ### pool-algorithm
 
 Allows choosing the algorithm for a specific pool. See `algorithm`.
 
+
 ### nfactor
 
 Overrides the default scrypt parameter N, specified as the factor of 2
 (`N = 2^nfactor`).
 
+If specified in a pool section in the configuration file, sets the
+option for that pool only. Otherwise sets the default.
+
 *Argument:* whole number (>1).
 
 *Default:* depends on `algorithm`; otherwise `10`.
 
+
 ### pool-nfactor
 
-Overrides the default scrypt parameter N for a specific pool. See `nfactor`.
+Overrides the default scrypt parameter N for a specific pool.
+See `nfactor`.
+
 
 ## CLI-only options