diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3efcc03d..836d6faa4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
     change, its unnecessary.
   - Puppet supports `module_path` configuration to mount local modules directory
     as a shared folder and configure puppet with it. [GH-270]
+  - `ssh-config` now outputs `127.0.0.1` as the host instead of `localhost`.
 
 ## 0.6.9 (December 21, 2010)
 
diff --git a/templates/ssh_config.erb b/templates/ssh_config.erb
index 060c5bb1b..6c9325ef1 100644
--- a/templates/ssh_config.erb
+++ b/templates/ssh_config.erb
@@ -1,5 +1,5 @@
 Host <%= host_key %>
-  HostName localhost
+  HostName 127.0.0.1
   User <%= ssh_user %>
   Port <%= ssh_port %>
   UserKnownHostsFile /dev/null