diff --git a/HISTORY b/HISTORY
index 10a268a5..620061a3 100644
--- a/HISTORY
+++ b/HISTORY
@@ -810,3 +810,9 @@ Video Disk Recorder Revision History
   are sorted chronologically. Sorting is done according to the setting of the
   current locale, so you may want to make sure LC_COLLATE is set to the desired
   value (see INSTALL).
+- Fixed handling 'newline' characters in EPG texts (thanks to Rolf Hakenes for
+  an improved version of his 'libdtv').
+  Newline characters are always mapped to a single "blank" in VDR, because they
+  would otherwise disturb the Title and Subtitle layout in the channel display
+  (where these are assumed to be single line texts) and would have to be
+  specially handled in the 'epg.data' file and the LSTE command in SVDRP.
diff --git a/eit.c b/eit.c
index 1fceeef1..79c3b5fb 100644
--- a/eit.c
+++ b/eit.c
@@ -16,7 +16,7 @@
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
- * $Id: eit.c 1.24 2001/09/22 13:07:21 kls Exp $
+ * $Id: eit.c 1.25 2001/10/07 13:42:48 kls Exp $
  ***************************************************************************/
 
 #include "eit.h"
@@ -337,6 +337,12 @@ void cEventInfo::Dump(FILE *f, const char *Prefix) const
 
 void cEventInfo::FixEpgBugs(void)
 {
+  // VDR can't usefully handle newline characters in the EPG data, so let's
+  // always convert them to blanks (independent of the setting of EPGBugfixLevel):
+  strreplace(pTitle, '\n', ' ');
+  strreplace(pSubtitle, '\n', ' ');
+  strreplace(pExtendedDescription, '\n', ' ');
+
   if (Setup.EPGBugfixLevel == 0)
      return;