diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7cf7ae84..c07505d1 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1118,6 +1118,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  keys in the Setup/DVB menu
  for making the Recordings menu display the length (in hours:minutes) of each recording
  for fixing handling DVB subtitles and implementing decoding textual DVB subtitles
+ for adding file name and line number to LOG_ERROR_STR()
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index cc93f4fc..b8e7a9a4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6777,3 +6777,4 @@ Video Disk Recorder Revision History
 - Removed the '.pl' suffix from all scripts (thanks to Ville Skyttä).
 - Changed the default location for the LIRC socket to /var/run/lirc/lircd (thanks
   to Ville Skyttä).
+- Added file name and line number to LOG_ERROR_STR() (thanks to Rolf Ahrenberg).
diff --git a/tools.h b/tools.h
index 5b436fd4..86e8fb06 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.13 2011/12/04 13:38:17 kls Exp $
+ * $Id: tools.h 2.14 2011/12/04 14:48:03 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -36,7 +36,7 @@ extern int SysLogLevel;
 #define dsyslog(a...) void( (SysLogLevel > 2) ? syslog_with_tid(LOG_ERR, a) : void() )
 
 #define LOG_ERROR         esyslog("ERROR (%s,%d): %m", __FILE__, __LINE__)
-#define LOG_ERROR_STR(s)  esyslog("ERROR: %s: %m", s)
+#define LOG_ERROR_STR(s)  esyslog("ERROR (%s,%d): %s: %m", __FILE__, __LINE__, s)
 
 #define SECSINDAY  86400