diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75384e2f7..bf836e253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,8 @@
     [GH-502]
   - Tweaks that should make "Waiting for VM to boot" slightly more
     reliable.
+  - Add comments to Vagrantfile to make it detected as Ruby file for
+    `vi` and `emacs`. [GH-515]
 
 ## 0.8.7 (September 13, 2011)
 
diff --git a/templates/commands/init/Vagrantfile.erb b/templates/commands/init/Vagrantfile.erb
index 4538823a0..6824b106e 100644
--- a/templates/commands/init/Vagrantfile.erb
+++ b/templates/commands/init/Vagrantfile.erb
@@ -1,8 +1,6 @@
-<%= <<-END
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
-END
-%>
+
 Vagrant::Config.run do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,