diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e6184a52..a054e912 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1189,6 +1189,7 @@ Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
  for reporting a problem with adding new source types in case they are already
  registered
  for adding support for "Pilot", "T2-System-Id" and "SISO/MISO" parameters
+ for increasing the PMT_SCAN_TIMEOUT to avoid timeouts when scanning PMTs
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index f2bcde23..081b1fd8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -8307,7 +8307,7 @@ Video Disk Recorder Revision History
 - The APIVERSION has been increased to 2.0.6 due to the changes to pat.h, sdt.h and
   the functional modification to cFont::CreateFont().
 
-2015-01-04: Version 2.1.7
+2015-01-06: Version 2.1.7
 
 - No longer logging an error message in DirSizeMB() if the given directory doesn't
   exist. This avoids lots of log entries in case several VDRs use the same video
@@ -8334,3 +8334,5 @@ Video Disk Recorder Revision History
 - The new function cOsd::DrawScaledBitmap() is now used for drawing subtitles.
   This function can be reimplemented by high level OSDs which may be able to do
   the scaling in hardware or otherwise more efficiently (thanks to Thomas Reufer).
+- Increased the PMT_SCAN_TIMEOUT to avoid timeouts when scanning PMTs (thanks to
+  Rolf Ahrenberg).