diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index ca56c83a..d510c4e6 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -639,6 +639,7 @@ Oliver Endriss <o.endriss@gmx.de>
  against invalid data
  for reporting a problem in extracting APIVERSION with older versions of 'sed'
  for fixing broken APIVERSION extraction line in 'newplugin'
+ for making VDR no longer stop removing empty directories if an error occurs
 
 Reinhard Walter Buchner <rw.buchner@freenet.de>
  for adding some satellites to 'sources.conf'
diff --git a/HISTORY b/HISTORY
index 3e15e236..5f70895f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4870,3 +4870,5 @@ Video Disk Recorder Revision History
   CAMs better available, even if this means recording on the primary device (reported
   by Jörn Reder; thanks to Anssi Hannula for improving handling Transfer Mode devices
   in this).
+- No longer stopping removing empty directories if an error occurs (thanks to
+  Oliver Endriss).
diff --git a/tools.c b/tools.c
index 5869bf08..8ec1e696 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 1.119 2006/06/17 09:45:32 kls Exp $
+ * $Id: tools.c 1.120 2006/08/12 13:30:07 kls Exp $
  */
 
 #include "tools.h"
@@ -422,8 +422,7 @@ bool RemoveEmptyDirectories(const char *DirName, bool RemoveThis)
                  }
               else {
                  LOG_ERROR_STR(buffer);
-                 free(buffer);
-                 return false;
+                 empty = false;
                  }
               free(buffer);
               }