diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca53b3cd9d..2cfc5db815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,38 +24,39 @@ IMPROVEMENTS:
 
   * core: Backend names are now down cased during `init` in the same manner as `remote config` [GH-5012]
   * provider/aws: Add `is_multi_region_trail` option to CloudTrail [GH-4939]
-  * provider/aws: Add support for log validation + KMS encryption to `aws_cloudtrail` [GH-5051]
-  * provider/aws: Support custom endpoints for AWS EC2 ELB and IAM [GH-5114]
-  * provider/aws: Expose additional VPN Connection attributes [GH-5032]
   * provider/aws: Add support for HTTP(S) endpoints that auto confirm SNS subscription [GH-4711]
   * provider/aws: Add support for Tags to CloudTrail [GH-5135]
   * provider/aws: Add support for Tags to ElasticSearch [GH-4973]
+  * provider/aws: Add support for deployment configuration to `aws_ecs_service` [GH-5220]
+  * provider/aws: Add support for log validation + KMS encryption to `aws_cloudtrail` [GH-5051]
+  * provider/aws: Allow name-prefix and auto-generated names for IAM Server Cert [GH-5178]
+  * provider/aws: Expose additional VPN Connection attributes [GH-5032]
   * provider/aws: Return an error if no matching route is found for an AWS Route [GH-5155]
+  * provider/aws: Support custom endpoints for AWS EC2 ELB and IAM [GH-5114]
+  * provider/aws: The `cluster_type` on `aws_redshift_cluster` resources is now computed [GH-5238]
   * provider/aws: `aws_lambda_function` resources now support VPC configuration [GH-5149]
+  * provider/google: Add assigned IP Address to CloudSQL Instance `google_sql_database_instance` [GH-5245]
   * provider/openstack: Add support for Distributed Routers [GH-4878]
   * provider/openstack: Add support for optional cacert_file parameter [GH-5106]
-  * provider/aws: Add support for deployment configuration to `aws_ecs_service` [GH-5220]
-  * provider/google: Add assigned IP Address to CloudSQL Instance `google_sql_database_instance` [GH-5245]
-  * provider/aws: Allow name-prefix and auto-generated names for IAM Server Cert [GH-5178]
 
 BUG FIXES:
 
-  * core: Fix bug where `ignore_changes` could produce "diffs didn't match during apply" errors [GH-4965]
-  * core: Improve handling of Provisioners in the graph, fixing "Provisioner already initialized" errors [GH-4877]
   * core: Fix bug detecting deeply nested module orphans [GH-5022]
+  * core: Fix bug where `ignore_changes` could produce "diffs didn't match during apply" errors [GH-4965]
   * core: Fix race condition when handling tainted resource destroys [GH-5026]
-  * provider/openstack: Fix crash when `access_network` was not defined in instances [GH-4966]
+  * core: Improve handling of Provisioners in the graph, fixing "Provisioner already initialized" errors [GH-4877]
+  * provider/aws: Fix Copy of Tags to DB Instance when created from Snapshot [GH-5197]
   * provider/aws: Fix DynamoDB Table Refresh to ensure deleted tables are removed from state [GH-4943]
+  * provider/aws: Fix ElasticSearch `domain_name` validation [GH-4973]
   * provider/aws: Fix issue applying security group changes in EC2 Classic RDS for aws_db_instance [GH-4969]
-  * provider/cloudflare: `ttl` no longer shows a change on each plan on `cloudflare_record` resources [GH-5042]
-  * provider/aws: Fix reading auto scaling group load balancers [GH-5045]
   * provider/aws: Fix reading auto scaling group availability zones [GH-5044]
+  * provider/aws: Fix reading auto scaling group load balancers [GH-5045]
+  * provider/cloudflare: `ttl` no longer shows a change on each plan on `cloudflare_record` resources [GH-5042]
   * provider/docker: Fix the default docker_host value [GH-5088]
   * provider/google: Fix backend service max_utilization attribute [GH-5075]
   * provider/google: Fix reading of `google_compute_vpn_gateway` without an explicit [GH-5125]
-  * provider/aws: Fix ElasticSearch `domain_name` validation [GH-4973]
+  * provider/openstack: Fix crash when `access_network` was not defined in instances [GH-4966]
   * provider/vcd: Wait for DHCP assignment when creating `vcd_vapp` resources with no static IP assignment [GH-5195]
-  * provider/aws: Fix Copy of Tags to DB Instance when created from Snapshot [GH-5197]
 
 ## 0.6.11 (February 1, 2016)