diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index d80e29d3..ef28cadf 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -494,3 +494,7 @@ Clemens Kirchgatterer <clemens@thf.ath.cx>
 Emil Naepflein <Emil.Naepflein@philosys.de>
  for suggesting to take an active SVDRP connection into account when doing shutdown or
  housekeeping
+
+Gerald Berwolf <genka@genka.de>
+ for suggesting to deactivate some templates in tools.h in case some plugin needs to
+ use the STL
diff --git a/HISTORY b/HISTORY
index e3506c74..29e9d600 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1826,7 +1826,8 @@ Video Disk Recorder Revision History
   Clemens Kirchgatterer).
 - Removed transponders 10788, 11739 and 12266 from 'channels.conf' (apparently they
   are no longer active).
-- Deactivated some templates in tools.h in case some plugin needs to use the STL.
+- Deactivated some templates in tools.h in case some plugin needs to use the STL
+  (suggested by Gerald Berwolf).
 - Timers now accept channel IDs even if the 'source' is 0 (thanks to Stefan Huelswitt
   for reporting this one).
 - Now taking an active SVDRP connection into account when doing shutdown or