diff --git a/manifests/scriptreceiver.pp b/manifests/scriptreceiver.pp
index 12e56ac..420696d 100644
--- a/manifests/scriptreceiver.pp
+++ b/manifests/scriptreceiver.pp
@@ -90,6 +90,13 @@ class sunetdrive::scriptreceiver()
     minute  =>  '*',
     hour    =>  '*',
   }
+  file { '/usr/local/bin/clear_scriptherder':
+    ensure  => file,
+    content => template('sunetdrive/scriptreceiver/clear_scriptherder.erb.sh'),
+    mode    => '0740',
+    owner   => 'root',
+    group   => 'root',
+  }
   file { '/home/script/bin/makeswap.sh':
     ensure  => absent,
   }
diff --git a/templates/scriptreceiver/clear_scriptherder.erb.sh b/templates/scriptreceiver/clear_scriptherder.erb.sh
new file mode 100644
index 0000000..39cd6e5
--- /dev/null
+++ b/templates/scriptreceiver/clear_scriptherder.erb.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+for job in $(/usr/local/bin/scriptherder | grep -Ev " OK |Start|^$|===" | awk -F ' ' '{print $9}'); do
+  /usr/local/bin/scriptherder --mode wrap --syslog --name "${job}" -- /bin/true
+done