diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index e0b9ee1c..b17dfd87 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -47,6 +47,7 @@ Matthias Schniedermeyer <ms@citd.de>
  for implementing the 'MarkInstantRecord' setup option
  for his "schnitt" tools
  for his "master-timer" tool
+ for helping to debug the "move to last position in list" bug
 
 Miha Setina <mihasetina@softhome.net>
  for translating the OSD texts to the Slovenian language
diff --git a/HISTORY b/HISTORY
index bf8ce2c9..221f7df8 100644
--- a/HISTORY
+++ b/HISTORY
@@ -969,3 +969,8 @@ Video Disk Recorder Revision History
   radio recordings. Thanks to Michael Paar.
 - Fixed a problem with the ERR macro defined by ncurses.h (thanks to Artur
   Skawina).
+
+2002-02-05: Version 0.99pre6
+
+- Fixed a bug in moving timers or channels to the last position in the list
+  (thanks to Matthias Schniedermeyer for helping to debug this one).
diff --git a/tools.c b/tools.c
index 441c5ce8..e95bdf8d 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.56 2002/02/03 16:44:08 kls Exp $
+ * $Id: tools.c 1.57 2002/02/05 18:16:52 kls Exp $
  */
 
 #include "tools.h"
@@ -804,8 +804,10 @@ void cListBase::Move(cListObject *From, cListObject *To)
            To->Prev()->Append(From);
         From->Append(To);
         }
-     else
+     else {
         lastObject->Append(From);
+        lastObject = From;
+        }
      if (!From->Prev())
         objects = From;
      }