diff --git a/ChangeLog b/ChangeLog
index 9668ece0..c2430f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Quickly terminate commands when ctrl-c is pressed.
+	* src/DownloadEngine.cc
+
 2008-11-12  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Quickly terminate idle commands when download finished.
diff --git a/src/DownloadEngine.cc b/src/DownloadEngine.cc
index c2ebfc39..0dfc928f 100644
--- a/src/DownloadEngine.cc
+++ b/src/DownloadEngine.cc
@@ -820,10 +820,14 @@ void DownloadEngine::afterEachIteration()
     logger->notice(_("Shutdown sequence commencing... Press Ctrl-C again for emergency shutdown."));
     requestHalt();
     globalHaltRequested = 2;
+    setNoWait(true);
+    setRefreshInterval(0);
   } else if(globalHaltRequested == 3) {
     logger->notice(_("Emergency shutdown sequence commencing..."));
     _requestGroupMan->forceHalt();
     globalHaltRequested = 4;
+    setNoWait(true);
+    setRefreshInterval(0);
   }
 }