diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index fde5a86b..825af8a4 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1626,6 +1626,7 @@ Ville Skytt
  thread.c caused a compiler warning with g++ 4.1.1
  for fixing converting the port number in the "connect from..." log message of SVDRP
  for reporting that there are places where ntohs() is assigned to different types
+ for adapting cThread::ThreadId() to recent kernels
 
 Steffen Beyer <cpunk@reactor.de>
  for fixing setting the colored button help after deleting a recording in case the next
diff --git a/HISTORY b/HISTORY
index b378680d..d04d3584 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4875,10 +4875,11 @@ Video Disk Recorder Revision History
 - Added a log error message to cPlugin::ConfigDirectory() in case a plugin calls it
   from a separate thread (reported by Udo Richter).
 
-2006-08-14: Version 1.4.1-5
+2006-08-20: Version 1.4.1-5
 
 - Replaced the "quick workaround for additional live audio PIDs" in
   cDvbDevice::SetChannelDevice() with an actual solution in
   cDvbDevice::SetAudioTrackDevice() in order to prevent sticky PIDs in CAMs,
   which caused long switching times or completely blank screens when switching
   between encrypted channels on the same transponder (reported by Tomas Berglund).
+- Adapted cThread::ThreadId() to recent kernels (thanks to Ville Skyttä).
diff --git a/thread.c b/thread.c
index 1749fc1e..8b6e58f4 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.56 2006/06/24 10:10:58 kls Exp $
+ * $Id: thread.c 1.57 2006/08/20 10:20:44 kls Exp $
  */
 
 #include "thread.h"
@@ -316,11 +316,9 @@ bool cThread::EmergencyExit(bool Request)
   return emergencyExitRequested = true; // yes, it's an assignment, not a comparison!
 }
 
-_syscall0(pid_t, gettid)
-
 tThreadId cThread::ThreadId(void)
 {
-  return gettid();
+  return syscall(__NR_gettid);
 }
 
 void cThread::SetMainThreadId(void)