diff --git a/cloud/amazon/ec2_ami_find.py b/cloud/amazon/ec2_ami_find.py
index 8be578fce1c..bc7ad944aa5 100644
--- a/cloud/amazon/ec2_ami_find.py
+++ b/cloud/amazon/ec2_ami_find.py
@@ -83,7 +83,8 @@ options:
     description:
       - Optional attribute which with to sort the results.
       - If specifying 'tag', the 'tag_name' parameter is required.
-    choices: ['name', 'description', 'tag']
+      - Starting at version 2.1, additional sort choices of architecture, block_device_mapping, creationDate, hypervisor, is_public, location, owner_id, platform, root_device_name, root_device_type, state, and virtualization_type are supported.  
+    choices: ['name', 'description', 'tag', 'architecture', 'block_device_mapping', 'creationDate', 'hypervisor', 'is_public', 'location', 'owner_id', 'platform', 'root_device_name', 'root_device_type', 'state', 'virtualization_type']
     default: null
     required: false
   sort_tag:
@@ -303,7 +304,7 @@ def main():
             name = dict(required=False),
             platform = dict(required=False),
             sort = dict(required=False, default=None,
-                choices=['name', 'description', 'tag']),
+                choices=['name', 'description', 'tag', 'architecture', 'block_device_mapping', 'creationDate', 'hypervisor', 'is_public', 'location', 'owner_id', 'platform', 'root_device_name', 'root_device_type', 'state', 'virtualization_type']),
             sort_tag = dict(required=False),
             sort_order = dict(required=False, default='ascending',
                 choices=['ascending', 'descending']),