diff --git a/attributes/default.rb b/attributes/default.rb
index 7d7e7896..63135e53 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -9,6 +9,8 @@
   nginx::http_stub_status_module
 )
 
+default['deploy']['timeout'] = 600
+
 # global
 default['defaults']['global']['environment'] = 'production'
 default['defaults']['global']['symlinks'] = {
diff --git a/recipes/deploy.rb b/recipes/deploy.rb
index ec6cef90..29b7ad4c 100644
--- a/recipes/deploy.rb
+++ b/recipes/deploy.rb
@@ -96,6 +96,8 @@
 
       run_callback_from_file(File.join(release_path, 'deploy', 'after_restart.rb'))
     end
+
+    timeout node['deploy']['timeout']
   end
 
   fire_hook(:after_deploy, items: databases + [scm, framework, appserver, worker, webserver])