diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 8b289bf7..4159b66f 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2175,6 +2175,7 @@ Tobias Grimm <tobias.grimm@e-tobi.net>
  for fixing a signed character used as index in cBase64Encoder::NextLine()
  for fixing formatting the name section in the VDR man pages
  for reporting unneeded include files <linux/dvb/dmx.h> und <time.h> in remux.h
+ for a patch that added a workaround for the broken linux-dvb driver header files
 
 Helge Lenz <h.lenz@gmx.de>
  for reporting a bug in setting the 'Delta' parameter when calling the shutdown
diff --git a/HISTORY b/HISTORY
index f32238ca..278af297 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6075,7 +6075,7 @@ Video Disk Recorder Revision History
 - cFrameDetector::Analyze() now syncs on the TS packet sync bytes (thanks to
   Oliver Endriss for reporting broken index generation after a buffer overflow).
 
-2009-05-30: Version 1.7.8
+2009-06-01: Version 1.7.8
 
 - Fixed a typo in aspect ratio 2.21:1 (reported by Reinhard Nissl).
 - The name of the function cDevice::GetVideoSize() wasn't very well chosen
@@ -6115,3 +6115,5 @@ Video Disk Recorder Revision History
 - Fixed a memory leak when reaching the end of a recording during replay (reported
   by Reinhard Nissl).
 - Fixed calling close(-1) in cUnbufferedFile::Close() (reported by Reinhard Nissl).
+- Added a workaround for the broken linux-dvb driver header files (based on a patch
+  from Tobias Grimm).
diff --git a/dvbdevice.h b/dvbdevice.h
index e9aa9f8b..58e4450c 100644
--- a/dvbdevice.h
+++ b/dvbdevice.h
@@ -4,12 +4,13 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: dvbdevice.h 2.5 2009/05/08 13:33:46 kls Exp $
+ * $Id: dvbdevice.h 2.6 2009/06/01 11:20:32 kls Exp $
  */
 
 #ifndef __DVBDEVICE_H
 #define __DVBDEVICE_H
 
+#include <sys/mman.h> // FIXME: workaround for broken linux-dvb header files
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/version.h>
 #include "device.h"