diff --git a/HISTORY b/HISTORY
index 407baf02..29b18470 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1029,3 +1029,5 @@ Video Disk Recorder Revision History
 - The new Setup parameter RecordDolbyDigital can be used to generally turn off
   recording the Dolby Digital audio channels in case you want to save disk space
   or don't have the equipment to replay Dolby Digital audio.
+- Reading the 'setup.conf' file no longer terminates in case of an error, but
+  rather attempts to read the rest of the file.
diff --git a/config.c b/config.c
index 8e6cf37a..213fe2cf 100644
--- a/config.c
+++ b/config.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.c 1.86 2002/02/24 11:53:12 kls Exp $
+ * $Id: config.c 1.87 2002/02/24 11:59:14 kls Exp $
  */
 
 #include "config.h"
@@ -994,7 +994,6 @@ bool cSetup::Load(const char *FileName)
               if (*buffer != '#' && !Parse(buffer)) {
                  esyslog(LOG_ERR, "error in %s, line %d\n", fileName, line);
                  result = false;
-                 break;
                  }
               }
            }