diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8dc2b07..8bc27de 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,31 @@ The format is loosely based on [Keep a Changelog](http://keepachangelog.com/en/1
 ## Next
 
 
+### User-facing
+
+#### Added
+
+- \#248 Add support for modifying the configuration of Shielded VM [lcy0321]
+- \#244 Add accelerator (GPU) configuration [johanvdhaegen]
+- \#216 Add support for Windows hosts through WinRM [dvanbrug]
+
+#### Fixed
+
+- \#246 Fix config override during metadata merge [mavin]
+- \#249 Fix shielded API failures on non-shielded VM's [temikus]
+- \#227 Fix additional disks being auto-deleted unless a disk type is specified [chrisgavin]
+
+### Development
+
+#### Fixed
+
+- \#247 chore: Update Gemfile with new `vagrant-spec` branch name [mavin]
+- \#241 Fix unfortunate CI `on:` trigger typo [temikus]
+- \#240 Update development environment, add CI functionality [Temikus]
+- \#239 Remove old fixup in Gemfile [Temikus]
+- \#237 Bump image size for test skeleton [Temikus]
+
+
 ## 2.5.0 (September 2019)
 
 ### User-facing
diff --git a/lib/vagrant-google/version.rb b/lib/vagrant-google/version.rb
index 56e8954..a161c2d 100644
--- a/lib/vagrant-google/version.rb
+++ b/lib/vagrant-google/version.rb
@@ -13,6 +13,6 @@
 # limitations under the License.
 module VagrantPlugins
   module Google
-    VERSION = "2.5.0".freeze
+    VERSION = "2.6.0".freeze
   end
 end
diff --git a/tasks/changelog.rake b/tasks/changelog.rake
index 857e257..6ff28ad 100644
--- a/tasks/changelog.rake
+++ b/tasks/changelog.rake
@@ -25,13 +25,16 @@ end
 
 # Extracts all github users contributed since last tag
 def users_since_last_tag
-  `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --grep="Merge" --pretty=format:"%s" | cut -d' ' -f 6 | cut -d/ -f1 | uniq`
+  `git --no-pager log $(git describe --tags --abbrev=0)..HEAD --grep="Merge" --pretty=format:"%s" | cut -d' ' -f 6 | cut -d/ -f1 | sort | uniq`
 end
 
 namespace :changelog do
   task :generate do
     insert_after_line("CHANGELOG.md", changes_since_last_tag, /^## Next/)
     printf("Users contributed since last release:\n")
-    printf(users_since_last_tag)
+    contributors = users_since_last_tag.split("\n").map { |name| "@" + name }
+    printf("Huge thanks to all our contributors 🎆\n")
+    printf("Special thanks to: " + contributors.join(" ") + "\n")
+    printf("\nI'll merge this and release the gem once all tests pass.\n")
   end
 end