diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d23f8311..823d91abd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 ## 0.5.2 (unreleased)
 
+  - Added "IdentitiesOnly yes" to options when `vagrant ssh` is run to
+    avoid "Too Many Authentication Failures" error. [GH-131]
   - Fix regression with `package` not working. [GH-132]
   - Added ability to specify box url in `init`, which populates the
     Vagrantfile with the proper `config.vm.box_url`.
diff --git a/lib/vagrant/ssh.rb b/lib/vagrant/ssh.rb
index 3347bbdee..00072500e 100644
--- a/lib/vagrant/ssh.rb
+++ b/lib/vagrant/ssh.rb
@@ -33,7 +33,8 @@ module Vagrant
 
       # Command line options
       command_options = ["-p #{options[:port]}", "-o UserKnownHostsFile=/dev/null",
-                         "-o StrictHostKeyChecking=no", "-i #{options[:private_key_path]}"]
+                         "-o StrictHostKeyChecking=no", "-o IdentitiesOnly=yes",
+                         "-i #{options[:private_key_path]}"]
       command_options << "-o ForwardAgent=yes" if env.config.ssh.forward_agent
 
       # Some hackery going on here. On Mac OS X Leopard (10.5), exec fails