diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c9025c72..28d08f22 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -876,6 +876,7 @@ Niko Tarnanen <niko.tarnanen@hut.fi>
 Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for translating OSD texts to the Finnish language
  for fixing internationalization of the text for "Setup/DVB/Audio language(s)"
+ for making pressing the Power button not stop Transfer Mode or replay immediately
 
 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 68db5baa..cea62b8c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3559,3 +3559,5 @@ Video Disk Recorder Revision History
   session (thanks to Mirko Dölle).
 - Now dropping EPG events that have a zero start time or duration (thanks to
   Oliver Endriss).
+- No longer stopping Transfer Mode or replay immediately when the Power button
+  is pressed (thanks to Rolf Ahrenberg).
diff --git a/vdr.c b/vdr.c
index fcf21532..4f495fe0 100644
--- a/vdr.c
+++ b/vdr.c
@@ -22,7 +22,7 @@
  *
  * The project's page is at http://www.cadsoft.de/vdr
  *
- * $Id: vdr.c 1.205 2005/05/26 10:04:58 kls Exp $
+ * $Id: vdr.c 1.206 2005/05/26 10:30:18 kls Exp $
  */
 
 #include <getopt.h>
@@ -744,7 +744,6 @@ int main(int argc, char *argv[])
           // Power off:
           case kPower: isyslog("Power button pressed");
                        DELETENULL(Menu);
-                       cControl::Shutdown();
                        Temp = NULL;
                        if (!Shutdown) {
                           Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!"));
@@ -906,6 +905,7 @@ int main(int argc, char *argv[])
                     if (WatchdogTimeout > 0)
                        signal(SIGALRM, SIG_IGN);
                     if (Interface->Confirm(tr("Press any key to cancel shutdown"), UserShutdown ? 5 : SHUTDOWNWAIT, true)) {
+                       cControl::Shutdown();
                        int Channel = timer ? timer->Channel()->Number() : 0;
                        const char *File = timer ? timer->File() : "";
                        Delta = Next - time(NULL); // compensates for Confirm() timeout