diff --git a/lib/ansible/playbook/play_context.py b/lib/ansible/playbook/play_context.py
index 521b472c56..ced3c5140d 100644
--- a/lib/ansible/playbook/play_context.py
+++ b/lib/ansible/playbook/play_context.py
@@ -56,6 +56,7 @@ MAGIC_VARIABLE_MAPPING = dict(
     remote_addr      = ('ansible_ssh_host', 'ansible_host'),
     remote_user      = ('ansible_ssh_user', 'ansible_user'),
     port             = ('ansible_ssh_port', 'ansible_port'),
+    timeout          = ('ansible_ssh_timeout', 'ansible_timeout'),
     ssh_executable   = ('ansible_ssh_executable',),
     accelerate_port  = ('ansible_accelerate_port',),
     password         = ('ansible_ssh_pass', 'ansible_password'),