diff --git a/addons/queue_job/jobrunner/__init__.py b/addons/queue_job/jobrunner/__init__.py
new file mode 100644
index 0000000..e2561b0
--- /dev/null
+++ b/addons/queue_job/jobrunner/__init__.py
@@ -0,0 +1,163 @@
+# Copyright (c) 2015-2016 ACSONE SA/NV (<http://acsone.eu>)
+# Copyright 2016 Camptocamp SA
+# License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl.html)
+
+import logging
+from threading import Thread
+import time
+
+from odoo.service import server
+from odoo.tools import config
+
+try:
+    from odoo.addons.server_environment import serv_config
+
+    if serv_config.has_section("queue_job"):
+        queue_job_config = serv_config["queue_job"]
+    else:
+        queue_job_config = {}
+except ImportError:
+    queue_job_config = config.misc.get("queue_job", {})
+
+
+from .runner import QueueJobRunner, _channels
+
+_logger = logging.getLogger(__name__)
+
+START_DELAY = 5
+
+
+# Here we monkey patch the Odoo server to start the job runner thread
+# in the main server process (and not in forked workers). This is
+# very easy to deploy as we don't need another startup script.
+
+
+class QueueJobRunnerThread(Thread):
+    def __init__(self):
+        Thread.__init__(self)
+        self.daemon = True
+        self.runner = QueueJobRunner.from_environ_or_config()
+
+    def run(self):
+        # sleep a bit to let the workers start at ease
+        time.sleep(START_DELAY)
+        self.runner.run()
+
+    def stop(self):
+        self.runner.stop()
+
+
+class WorkerJobRunner(server.Worker):
+    """Jobrunner workers"""
+
+    def __init__(self, multi):
+        super().__init__(multi)
+        self.watchdog_timeout = None
+        self.runner = QueueJobRunner.from_environ_or_config()
+        self._recover = False
+
+    def sleep(self):
+        pass
+
+    def signal_handler(self, sig, frame):  # pylint: disable=missing-return
+        _logger.debug("WorkerJobRunner (%s) received signal %s", self.pid, sig)
+        super().signal_handler(sig, frame)
+        self.runner.stop()
+
+    def process_work(self):
+        if self._recover:
+            _logger.info("WorkerJobRunner (%s) runner is reinitialized", self.pid)
+            self.runner = QueueJobRunner.from_environ_or_config()
+            self._recover = False
+        _logger.debug("WorkerJobRunner (%s) starting up", self.pid)
+        time.sleep(START_DELAY)
+        self.runner.run()
+
+    def signal_time_expired_handler(self, n, stack):
+        _logger.info(
+            "Worker (%d) CPU time limit (%s) reached.Stop gracefully and recover",
+            self.pid,
+            config["limit_time_cpu"],
+        )
+        self._recover = True
+        self.runner.stop()
+
+
+runner_thread = None
+
+
+def _is_runner_enabled():
+    return not _channels().strip().startswith("root:0")
+
+
+def _start_runner_thread(server_type):
+    global runner_thread
+    if not config["stop_after_init"]:
+        if _is_runner_enabled():
+            _logger.info("starting jobrunner thread (in %s)", server_type)
+            runner_thread = QueueJobRunnerThread()
+            runner_thread.start()
+        else:
+            _logger.info(
+                "jobrunner thread (in %s) NOT started, "
+                "because the root channel's capacity is set to 0",
+                server_type,
+            )
+
+
+orig_prefork__init__ = server.PreforkServer.__init__
+orig_prefork_process_spawn = server.PreforkServer.process_spawn
+orig_prefork_worker_pop = server.PreforkServer.worker_pop
+orig_threaded_start = server.ThreadedServer.start
+orig_threaded_stop = server.ThreadedServer.stop
+
+
+def prefork__init__(server, app):
+    res = orig_prefork__init__(server, app)
+    server.jobrunner = {}
+    return res
+
+
+def prefork_process_spawn(server):
+    orig_prefork_process_spawn(server)
+    if not hasattr(server, "jobrunner"):
+        # if 'queue_job' is not in server wide modules, PreforkServer is
+        # not initialized with a 'jobrunner' attribute, skip this
+        return
+    if not server.jobrunner and _is_runner_enabled():
+        server.worker_spawn(WorkerJobRunner, server.jobrunner)
+
+
+def prefork_worker_pop(server, pid):
+    res = orig_prefork_worker_pop(server, pid)
+    if not hasattr(server, "jobrunner"):
+        # if 'queue_job' is not in server wide modules, PreforkServer is
+        # not initialized with a 'jobrunner' attribute, skip this
+        return res
+    if pid in server.jobrunner:
+        server.jobrunner.pop(pid)
+    return res
+
+
+def threaded_start(server, *args, **kwargs):
+    res = orig_threaded_start(server, *args, **kwargs)
+    _start_runner_thread("threaded server")
+    return res
+
+
+def threaded_stop(server):
+    global runner_thread
+    if runner_thread:
+        runner_thread.stop()
+    res = orig_threaded_stop(server)
+    if runner_thread:
+        runner_thread.join()
+        runner_thread = None
+    return res
+
+
+server.PreforkServer.__init__ = prefork__init__
+server.PreforkServer.process_spawn = prefork_process_spawn
+server.PreforkServer.worker_pop = prefork_worker_pop
+server.ThreadedServer.start = threaded_start
+server.ThreadedServer.stop = threaded_stop