diff --git a/website/source/docs/providers/aws/r/s3_bucket.html.markdown b/website/source/docs/providers/aws/r/s3_bucket.html.markdown
new file mode 100644
index 000000000..dcce52738
--- /dev/null
+++ b/website/source/docs/providers/aws/r/s3_bucket.html.markdown
@@ -0,0 +1,32 @@
+---
+layout: "aws"
+page_title: "AWS: aws_s3_bucket"
+sidebar_current: "docs-aws-resource-s3-bucket"
+---
+
+# aws\_s3\_bucket
+
+Provides a S3 bucket resource.
+
+## Example Usage
+
+```
+resource "aws_s3_bucket" "b" {
+    bucket = "my_tf_test_bucket"
+    acl = "private"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `bucket` - (Required) The name of the bucket.
+* `acl` - (Optional) The canned ACL to apply. Defaults to "private".
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The name of the bucket
+
diff --git a/website/source/docs/providers/aws/r/subnet.html.markdown b/website/source/docs/providers/aws/r/subnet.html.markdown
index 49912c85c..358ed720b 100644
--- a/website/source/docs/providers/aws/r/subnet.html.markdown
+++ b/website/source/docs/providers/aws/r/subnet.html.markdown
@@ -11,7 +11,7 @@ Provides an VPC subnet resource.
 ## Example Usage
 
 ```
-resource "aws_vpc" "main" {
+resource "aws_subnet" "main" {
     vpc_id = "${aws_vpc.main.id}"
     cidr_block = "10.0.1.0/16"
 }
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 3a5bb3b11..b4b78fa57 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -25,6 +25,10 @@
 					<a href="/docs/providers/aws/r/route53_zone.html">aws_route53_zone</a>
                     </li>
 
+                    <li<%= sidebar_current("docs-aws-resource-s3-bucket") %>>
+					<a href="/docs/providers/aws/r/s3_bucket.html">aws_s3_bucket</a>
+                    </li>
+
                     <li<%= sidebar_current("docs-aws-resource-security-group") %>>
 					<a href="/docs/providers/aws/r/security_group.html">aws_security_group</a>
                     </li>