diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc7f3b603..502175b4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ BUG FIXES:
 
   - core: Fix issues with dynamic linker not finding symbols on OS X. [GH-2219]
   - core: Properly clean up machine directories on destroy. [GH-2223]
+  - core: Add a timeout to waiting for SSH connection and server headers
+    on SSH. [GH-2226]
 
 ## 1.3.2 (September 17, 2013)
 
diff --git a/plugins/communicators/ssh/communicator.rb b/plugins/communicators/ssh/communicator.rb
index 44c09fcec..6b12ebfa5 100644
--- a/plugins/communicators/ssh/communicator.rb
+++ b/plugins/communicators/ssh/communicator.rb
@@ -207,6 +207,7 @@ module VagrantPlugins
                 # Setup logging for connections
                 connect_opts = opts.merge({
                   :logger  => ssh_logger,
+                  :timeout => 15,
                   :verbose => :debug
                 })