diff --git a/scripts/supybot b/scripts/supybot
index 85432bcd3..60fb883d7 100755
--- a/scripts/supybot
+++ b/scripts/supybot
@@ -77,6 +77,7 @@ def main():
             drivers.run()
         except KeyboardInterrupt:
             log.info('Exiting due to Ctrl-C.')
+            world.upkeep()
             break
         except SystemExit, e:
             s = str(e)
diff --git a/src/Owner.py b/src/Owner.py
index aee6112d5..3789fb974 100644
--- a/src/Owner.py
+++ b/src/Owner.py
@@ -464,6 +464,7 @@ class Owner(privmsgs.CapabilityCheckingPrivmsg):
 
         Exits the bot.
         """
+        world.upkeep()
         world.ircs[:] = []
 
     def flush(self, irc, msg, args):