diff --git a/HISTORY b/HISTORY
index 0b24e89d..bb38e56b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -2201,3 +2201,4 @@ Video Disk Recorder Revision History
 - Changed the DEFAULTPRIORITY in device.c to -1, so that the primary device
   will be used for FTA recordings in case the CAM is connected to a non-primary
   device (thanks to Reinhard Walter Buchner for reporting this one).
+- The cCiHandler now closes its file handle when it gets destroyed.
diff --git a/ci.c b/ci.c
index 91d9ede9..3575d142 100644
--- a/ci.c
+++ b/ci.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.c 1.14 2003/04/20 09:52:45 kls Exp $
+ * $Id: ci.c 1.15 2003/05/25 11:45:11 kls Exp $
  */
 
 /* XXX TODO
@@ -1287,6 +1287,7 @@ void cCiCaPmt::AddCaDescriptor(int Length, uint8_t *Data)
 
 cCiHandler::cCiHandler(int Fd, int NumSlots)
 {
+  fd = Fd;
   numSlots = NumSlots;
   newCaSupport = false;
   hasUserIO = false;
@@ -1301,6 +1302,7 @@ cCiHandler::~cCiHandler()
   for (int i = 0; i < MAX_CI_SESSION; i++)
       delete sessions[i];
   delete tpl;
+  close(fd);
 }
 
 cCiHandler *cCiHandler::CreateCiHandler(const char *FileName)
diff --git a/ci.h b/ci.h
index 79ed62f3..62046e5a 100644
--- a/ci.h
+++ b/ci.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: ci.h 1.7 2003/04/20 09:21:23 kls Exp $
+ * $Id: ci.h 1.8 2003/05/25 11:44:47 kls Exp $
  */
 
 #ifndef __CI_H
@@ -79,6 +79,7 @@ class cCiTransportConnection;
 class cCiHandler {
 private:
   cMutex mutex;
+  int fd;
   int numSlots;
   bool newCaSupport;
   bool hasUserIO;