diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35719393b..6b80c3e1f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,13 @@ IMPROVEMENTS:
 
   * providers/amazon: Add `ebs_optimized` flag. [GH-260]
   * providers/digitalocean: Handle 404 on delete
-  * providers/digitalocean: Add user_data argument for creating droplets
+  * providers/digitalocean: Add `user_data` argument for creating droplets
+  * providers/google: Disks can be marked `auto_delete`. [GH-254]
+
+BUG FIXES:
+
+  * providers/google: Attaching a disk source (not an image) works
+      properly. [GH-254]
 
 ## 0.2.1 (August 31, 2014)
 
diff --git a/website/source/docs/providers/google/r/compute_instance.html.markdown b/website/source/docs/providers/google/r/compute_instance.html.markdown
index 5c9ddced5..c9f0bd896 100644
--- a/website/source/docs/providers/google/r/compute_instance.html.markdown
+++ b/website/source/docs/providers/google/r/compute_instance.html.markdown
@@ -64,6 +64,9 @@ The `disk` block supports:
 * `image` - (Required if disk not set) The name of the image to base
     this disk off of.
 
+* `auto_delete` - (Optional) Whether or not the disk should be auto-deleted.
+    This defaults to true.
+
 The `network` block supports:
 
 * `source` - (Required) The name of the network to attach this interface to.