diff --git a/library/cloud/ec2_ami b/library/cloud/ec2_ami
index b9573d4d9ad..cbeb8388df8 100644
--- a/library/cloud/ec2_ami
+++ b/library/cloud/ec2_ami
@@ -241,7 +241,7 @@ def main():
             delete_snapshot = dict(),
             name = dict(),
             wait = dict(type="bool", default=False),
-            wait_timeout = dict(default=300),
+            wait_timeout = dict(default=900),
             description = dict(default=""),
             no_reboot = dict(default=True, type="bool"),
             state = dict(default='present')