diff --git a/remote.c b/remote.c
index 87c70923..f60d7685 100644
--- a/remote.c
+++ b/remote.c
@@ -6,7 +6,7 @@
  *
  * Ported to LIRC by Carsten Koch <Carsten.Koch@icem.de>  2000-06-16.
  *
- * $Id: remote.c 1.17 2000/10/08 11:39:11 kls Exp $
+ * $Id: remote.c 1.18 2000/10/08 16:49:41 kls Exp $
  */
 
 #include "remote.h"
@@ -115,6 +115,7 @@ cRcIoRCU::cRcIoRCU(char *DeviceName)
 
 cRcIoRCU::~cRcIoRCU()
 {
+  Stop();
 }
 
 void cRcIoRCU::Action(void)
@@ -419,6 +420,7 @@ cRcIoLIRC::cRcIoLIRC(char *DeviceName)
 
 cRcIoLIRC::~cRcIoLIRC()
 {
+  Stop();
 }
 
 void cRcIoLIRC::Action(void)
diff --git a/thread.c b/thread.c
index 7e3ee939..7304e682 100644
--- a/thread.c
+++ b/thread.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: thread.c 1.1 2000/10/07 17:31:39 kls Exp $
+ * $Id: thread.c 1.2 2000/10/08 16:45:50 kls Exp $
  */
 
 #include "thread.h"
@@ -58,7 +58,7 @@ bool cThread::Start(void)
 
 void cThread::Stop(void)
 {
-  pthread_exit(NULL);
+  pthread_cancel(thread);
 }
 
 bool cThread::Lock(void)