diff --git a/layerindex/urls.py b/layerindex/urls.py
index e8ba8c9..bab7f10 100644
--- a/layerindex/urls.py
+++ b/layerindex/urls.py
@@ -8,7 +8,7 @@ from django.conf.urls import *
 from django.views.generic import TemplateView, DetailView, ListView, RedirectView
 from django.views.defaults import page_not_found
 from django.core.urlresolvers import reverse_lazy
-from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, MachineSearchView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, HistoryListView, EditProfileFormView, AdvancedRecipeSearchView, BulkChangeView, BulkChangeSearchView, bulk_change_edit_view, bulk_change_patch_view, BulkChangeDeleteView, RecipeDetailView, RedirectParamsView, ClassicRecipeSearchView, ClassicRecipeDetailView, ClassicRecipeStatsView, LayerUpdateDetailView, UpdateListView, UpdateDetailView, StatsView, publish_view, LayerCheckListView, BBClassCheckListView, TaskStatusView, ComparisonRecipeSelectView, ComparisonRecipeSelectDetailView, task_log_view
+from layerindex.views import LayerListView, LayerReviewListView, LayerReviewDetailView, RecipeSearchView, MachineSearchView, LayerDetailView, edit_layer_view, delete_layer_view, edit_layernote_view, delete_layernote_view, HistoryListView, EditProfileFormView, AdvancedRecipeSearchView, BulkChangeView, BulkChangeSearchView, bulk_change_edit_view, bulk_change_patch_view, BulkChangeDeleteView, RecipeDetailView, RedirectParamsView, ClassicRecipeSearchView, ClassicRecipeDetailView, ClassicRecipeStatsView, LayerUpdateDetailView, UpdateListView, UpdateDetailView, StatsView, publish_view, LayerCheckListView, BBClassCheckListView, TaskStatusView, ComparisonRecipeSelectView, ComparisonRecipeSelectDetailView, task_log_view, task_stop_view
 from layerindex.models import LayerItem, Recipe, RecipeChangeset
 from rest_framework import routers
 from . import restviews
@@ -171,6 +171,9 @@ urlpatterns = [
     url(r'^tasklog/(?P<task_id>[-\w]+)/$',
             task_log_view,
             name='task_log'),
+    url(r'^stoptask/(?P<task_id>[-\w]+)/$',
+            task_stop_view,
+            name='task_stop'),
     url(r'^ajax/layerchecklist/(?P<branch>[-\w]+)/$',
         LayerCheckListView.as_view(
             template_name='layerindex/layerchecklist.html'),
diff --git a/layerindex/utils.py b/layerindex/utils.py
index 04599a1..88b3bd6 100644
--- a/layerindex/utils.py
+++ b/layerindex/utils.py
@@ -285,6 +285,7 @@ def parse_layer_conf(layerdir, data, logger=None):
     data = parse_conf(conf_file, data)
     data.expandVarref('LAYERDIR')
 
+child_pid = 0
 def runcmd(cmd, destdir=None, printerr=True, outfile=None, logger=None):
     """
         execute command, raise CalledProcessError if fail
@@ -296,10 +297,17 @@ def runcmd(cmd, destdir=None, printerr=True, outfile=None, logger=None):
         out = open(outfile, 'wb+')
     else:
         out = tempfile.TemporaryFile()
+
+    def onsigusr2(sig, frame):
+        # Kill the child process
+        os.kill(child_pid, signal.SIGTERM)
+    signal.signal(signal.SIGUSR2, onsigusr2)
     try:
-        try:
-            subprocess.check_call(cmd, stdout=out, stderr=out, cwd=destdir, shell=True)
-        except subprocess.CalledProcessError as e:
+        proc = subprocess.Popen(cmd, stdout=out, stderr=out, cwd=destdir, shell=True)
+        global child_pid
+        child_pid = proc.pid
+        proc.communicate()
+        if proc.returncode:
             out.seek(0)
             output = out.read()
             output = output.decode('utf-8', errors='replace').strip()
@@ -308,6 +316,7 @@ def runcmd(cmd, destdir=None, printerr=True, outfile=None, logger=None):
                     logger.error("%s" % output)
                 else:
                     sys.stderr.write("%s\n" % output)
+            e = subprocess.CalledProcessError(proc.returncode, cmd)
             e.output = output
             raise e
 
@@ -317,6 +326,7 @@ def runcmd(cmd, destdir=None, printerr=True, outfile=None, logger=None):
         if logger:
             logger.debug("output: %s" % output.rstrip() )
     finally:
+        signal.signal(signal.SIGUSR2, signal.SIG_DFL)
         if outfile:
             out.close()
     return output
diff --git a/layerindex/views.py b/layerindex/views.py
index f25b1bd..758ce84 100644
--- a/layerindex/views.py
+++ b/layerindex/views.py
@@ -1412,6 +1412,17 @@ def task_log_view(request, task_id):
         response['Task-Progress'] = preader.read()
     return response
 
+def task_stop_view(request, task_id):
+    from celery.result import AsyncResult
+    import signal
+    if not request.user.is_authenticated():
+        raise PermissionDenied
+
+    result = AsyncResult(task_id)
+    result.revoke(terminate=True, signal=signal.SIGUSR2)
+    return HttpResponse('terminated')
+
+
 class ComparisonRecipeSelectView(ClassicRecipeSearchView):
     def _can_edit(self):
         if self.request.user.is_authenticated():
diff --git a/templates/layerindex/task.html b/templates/layerindex/task.html
index 0937e03..597a07e 100644
--- a/templates/layerindex/task.html
+++ b/templates/layerindex/task.html
@@ -30,6 +30,10 @@
 </div>
 {% endif %}
 
+{% if not update.finished %}
+<button id="stopbutton" class="btn btn-danger pull-right">Stop</a>
+{% endif %}
+
 {% if update.comparisonrecipeupdate_set.exists %}
 <h3>Updated comparison recipes</h3>
 <ul>
@@ -92,6 +96,7 @@
         }).always(function () {
             if(done == '1') {
                 $("#task_status_fragment").html(" (finished in " + duration + ")")
+                $("#stopbutton").hide()
             }
             else {
                 window.setTimeout(updateLog, 1000);
@@ -103,6 +108,12 @@
         scrolling = ($(this).scrollTop() + $(this).height() + 50 > $(this).prop('scrollHeight'))
     });
 
+    $("#stopbutton").click(function() {
+        $.ajax({
+            url: "{% url 'task_stop' update.task_id %}"
+        });
+    });
+
     $(document).ready(function() {
         {% if not update.finished %}
         updateLog();