diff --git a/modules/openstack_project/files/gerrit/change-abandoned b/modules/openstack_project/files/gerrit/change-abandoned
new file mode 100755
index 0000000000..5761951eca
--- /dev/null
+++ b/modules/openstack_project/files/gerrit/change-abandoned
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+# Use timeout to kill any process running longer than 10 minutes.
+timeout -k 2m 10m /usr/local/bin/update-bug change-abandoned "$@"
diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 8aa1c49801..3515b145e9 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -296,6 +296,16 @@ class openstack_project::gerrit (
     require => Class['::gerrit'],
   }
 
+  file { '/home/gerrit2/review_site/hooks/change-abandoned':
+    ensure  => present,
+    owner   => 'root',
+    group   => 'root',
+    mode    => '0555',
+    source  => 'puppet:///modules/openstack_project/gerrit/change-abandoned',
+    replace => true,
+    require => Class['::gerrit'],
+  }
+
   file { '/home/gerrit2/review_site/hooks/notify_impact.yaml':
     ensure  => present,
     source  =>