diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 13a4e3d3..0b71284b 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2639,3 +2639,6 @@ Antti Sepp
 
 Henning Heinold <heinold@inf.fu-berlin.de>
  for fixing inclusion of <stdarg.h>
+
+Dominik Strasser <dominik@die-strassers.de>
+ for making a cRemote be removed from the Remotes list in case its initialization failed
diff --git a/HISTORY b/HISTORY
index 1fe74c72..242ada23 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6511,3 +6511,5 @@ Video Disk Recorder Revision History
   variables where additional 'k_...' flags are used.
 - Fixed inclusion of <stdarg.h> (thanks to Henning Heinold).
 - Changed "frame duration" to "frame rate" in vdr.5 (reported by Tobias Grimm).
+- Removing a cRemote from the Remotes list in case its initialization failed (thanks
+  to Dominik Strasser).
diff --git a/remote.c b/remote.c
index 82d5f007..048b98c3 100644
--- a/remote.c
+++ b/remote.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: remote.c 2.1 2009/12/06 12:08:03 kls Exp $
+ * $Id: remote.c 2.2 2010/12/24 15:26:05 kls Exp $
  */
 
 #include "remote.h"
@@ -42,6 +42,7 @@ cRemote::cRemote(const char *Name)
 
 cRemote::~cRemote()
 {
+  Remotes.Del(this, false);
   free(name);
 }