diff --git a/website/source/docs/providers/aws/d/subnet_ids.html.markdown b/website/source/docs/providers/aws/d/subnet_ids.html.markdown
new file mode 100644
index 0000000000..883d056754
--- /dev/null
+++ b/website/source/docs/providers/aws/d/subnet_ids.html.markdown
@@ -0,0 +1,40 @@
+---
+layout: "aws"
+page_title: "AWS: aws_subnet_ids"
+sidebar_current: "docs-aws-datasource-subnet-ids"
+description: |-
+    Provides a list of subnet Ids for a VPC
+---
+
+# aws\_subnet\_ids
+
+`aws_subnet_ids` provides a list of ids for a vpc_id
+
+This resource can be useful for getting back a list of subnet ids for a vpc.
+
+## Example Usage
+
+The following shows outputing all cidr blocks for every subnet id in a vpc.
+
+```
+data "aws_subnet_ids" "example" {
+  vpc_id = "${var.vpc_id}"
+}
+
+data "aws_subnet" "example" {
+  count = "${length(data.aws_subnet_ids.example.ids)}"
+  id = "${aws_subnet_ids.example.ids[count.index]}"
+}
+
+output "subnet_cidr_blocks" {
+  value = ["${data.aws_subnet.example.*.cidr_block}"]
+}
+```
+
+## Argument Reference
+
+* `vpc_id` - (Required) The VPC ID that you want to filter from.
+
+## Attributes Reference
+
+* `ids` - Is a list of all the subnet ids found. If none found. This data source will fail out.
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index d3e39f97d5..f7b66a1a5d 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -119,6 +119,9 @@
                         <li<%= sidebar_current("docs-aws-datasource-subnet") %>>
                             <a href="/docs/providers/aws/d/subnet.html">aws_subnet</a>
                         </li>
+                        <li<%= sidebar_current("docs-aws-datasource-subnet-ids") %>>
+                            <a href="/docs/providers/aws/d/subnet_ids.html">aws_subnet_ids</a>
+                        </li>
                         <li<%= sidebar_current("docs-aws-datasource-vpc") %>>
                             <a href="/docs/providers/aws/d/vpc.html">aws_vpc</a>
                         </li>