diff --git a/website/source/docs/providers/aws/r/launch_config.html.markdown b/website/source/docs/providers/aws/r/launch_config.html.markdown
new file mode 100644
index 000000000..4c697d9fa
--- /dev/null
+++ b/website/source/docs/providers/aws/r/launch_config.html.markdown
@@ -0,0 +1,36 @@
+---
+layout: "aws"
+page_title: "AWS: aws_launch_configuration"
+sidebar_current: "docs-aws-resource-launch-config"
+---
+
+# aws\_launch\_configuration
+
+Provides a resource to create a new launch configuration, used for autoscaling groups.
+
+## Example Usage
+
+```
+resource "aws_launch_configuration" "as_conf" {
+    name = "web_config"
+    image_id = "ami-1234"
+    instance_type = "m1.small"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `name` - (Required) The name of the launch configuration.
+* `image_id` - (Required) The EC2 image ID to launch.
+* `instance_type` - (Required) The size of instance to launch.
+* `key_name` - (Optional) The key name that should be used for the instance.
+* `security_groups` - (Optional) A list of associated security group IDS.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The ID of the launch configuration.
+
diff --git a/website/source/docs/providers/aws/r/route_table.html.markdown b/website/source/docs/providers/aws/r/route_table.html.markdown
new file mode 100644
index 000000000..fdde1d252
--- /dev/null
+++ b/website/source/docs/providers/aws/r/route_table.html.markdown
@@ -0,0 +1,40 @@
+---
+layout: "aws"
+page_title: "AWS: aws_route_table"
+sidebar_current: "docs-aws-resource-route-table|"
+---
+
+# aws\_route\_table
+
+Provides a resource to create a VPC routing table.
+
+## Example Usage
+
+```
+resource "aws_route_table" "r" {
+    vpc_id = "${aws_vpc.default.id}"
+    route {
+        cidr_block = "10.0.1.0/24"
+    }
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `vpc_id` - (Required) The ID of the routing table.
+* `route` - (Optional) A list of route objects. Their keys are documented below.
+
+Each route supports the following:
+
+* `cidr_block` - (Required) The CIDR block of the route.
+* `gateway_id` - (Optional) The Internet Gateway ID.
+* `instance_id` - (Optional) The EC2 instance ID.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The ID of the routing table
+
diff --git a/website/source/docs/providers/aws/r/route_table_assoc.html.markdown b/website/source/docs/providers/aws/r/route_table_assoc.html.markdown
new file mode 100644
index 000000000..2c924b7d2
--- /dev/null
+++ b/website/source/docs/providers/aws/r/route_table_assoc.html.markdown
@@ -0,0 +1,32 @@
+---
+layout: "aws"
+page_title: "AWS: aws_route_table_association"
+sidebar_current: "docs-aws-resource-route-table-assoc"
+---
+
+# aws\_route\_table\_association
+
+Provides a resource to create an association between a subnet and routing table.
+
+## Example Usage
+
+```
+resource "aws_route_table_association" "a" {
+    subnet_id = "${aws_subnet.foo.id}"
+    route_table_id = "${aws_route_table.bar.id}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `subnet_id` - (Required) The subnet ID to create an association.
+* `route_table_id` - (Required) The ID of the routing table to associate with.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `id` - The ID of the association
+
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index b4b78fa57..b61fa0235 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -17,6 +17,18 @@
 					<a href="/docs/providers/aws/r/eip.html">aws_eip</a>
                     </li>
 
+                    <li<%= sidebar_current("docs-aws-resource-launch-config") %>>
+					<a href="/docs/providers/aws/r/launch_config.html">aws_launch_configuration</a>
+					</li>
+
+                    <li<%= sidebar_current("docs-aws-resource-route-table|") %>>
+					<a href="/docs/providers/aws/r/route_table.html">aws_route_table</a>
+					</li>
+
+                    <li<%= sidebar_current("docs-aws-resource-route-table-assoc") %>>
+					<a href="/docs/providers/aws/r/route_table_assoc.html">aws_route_table_association</a>
+					</li>
+
                     <li<%= sidebar_current("docs-aws-resource-route53-record") %>>
 					<a href="/docs/providers/aws/r/route53_record.html">aws_route53_record</a>
 					</li>