diff --git a/CHANGELOG.md b/CHANGELOG.md
index b16ab2f195..283fde7cd6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,8 @@ Ansible Changes By Release
 
 ## 1.5 "Love Walks In" - Release pending!
 
+* no_reboot is now defaulted to "no" in the ec2_ami module to ensure filesystem consistency in the resulting AMI.
+
 ## 1.4.1 "Could This Be Magic" - November 27, 2013
 
 * Misc fixes to accelerate mode and various modules.
diff --git a/library/cloud/ec2_ami b/library/cloud/ec2_ami
index bc6be9a582..ea7e0ad86d 100644
--- a/library/cloud/ec2_ami
+++ b/library/cloud/ec2_ami
@@ -84,9 +84,9 @@ options:
     aliases: []
   no_reboot:
     description:
-      - An optional flag indicating that the bundling process should not attempt to shutdown the instance before bundling. If this flag is True, the responsibility of maintaining file system integrity is left to the owner of the instance.
+      - An optional flag indicating that the bundling process should not attempt to shutdown the instance before bundling. If this flag is True, the responsibility of maintaining file system integrity is left to the owner of the instance. The default choice is "no".
     required: false
-    default: yes
+    default: no
     choices: [ "yes", "no" ]
     aliases: []
   image_id: