diff --git a/VERSION b/VERSION
index 3185ad5a..1d84bd6e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-03 00:55:12) dev
+Version 2.00.0 (2012-08-03 08:57:50) dev
diff --git a/gluon/scheduler.py b/gluon/scheduler.py
index 9e775d98..d56c6158 100644
--- a/gluon/scheduler.py
+++ b/gluon/scheduler.py
@@ -63,6 +63,7 @@ import os
 import time
 import multiprocessing
 import sys
+import signal
 import cStringIO
 import threading
 import traceback
@@ -90,6 +91,7 @@ except:
 from gluon import DAL, Field, IS_NOT_EMPTY, IS_IN_SET, IS_NOT_IN_DB
 from gluon.utils import web2py_uuid
 
+
 QUEUED = 'QUEUED'
 ASSIGNED = 'ASSIGNED'
 RUNNING = 'RUNNING'
@@ -435,6 +437,7 @@ class Scheduler(MetaScheduler):
         db.commit()
 
     def loop(self,worker_name=None):
+        signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
         try:
             self.start_heartbeats()
             while True and self.have_heartbeat:
@@ -782,6 +785,7 @@ def main():
                         group_names = group_names,
                         heartbeat = options.heartbeat,
                         max_empty_runs = options.max_empty_runs)
+    signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
     print 'starting main worker loop...'
     scheduler.loop()