diff --git a/website/source/docs/providers/aws/r/eip.html.markdown b/website/source/docs/providers/aws/r/eip.html.markdown
new file mode 100644
index 000000000..c70f7b813
--- /dev/null
+++ b/website/source/docs/providers/aws/r/eip.html.markdown
@@ -0,0 +1,33 @@
+---
+layout: "aws"
+page_title: "AWS: aws_eip"
+sidebar_current: "docs-aws-resource-eip"
+---
+
+# aws\_eip
+
+Provides an Elastic IP resource.
+
+## Example Usage
+
+```
+resource "aws_eip" "lb" {
+    instance = "${aws_instance.web.instance_id}"
+}
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `vpc` - (Optional) VPC ID
+* `instance` - (Optional) EC2 instance ID.
+
+## Attributes Reference
+
+The following attributes are exported:
+
+* `private_ip` - Contrains the private IP address (if in VPC).
+* `public_ip` - Contains the public IP address.
+* `instance` - Contains the ID of the instance attached ot.
+
diff --git a/website/source/layouts/aws.erb b/website/source/layouts/aws.erb
index 84613c8b9..8137a2b1a 100644
--- a/website/source/layouts/aws.erb
+++ b/website/source/layouts/aws.erb
@@ -13,6 +13,10 @@
 				<li<%= sidebar_current("docs-aws-resource") %>>
 				<a href="#">Resources</a>
                 <ul class="nav nav-visible">
+                    <li<%= sidebar_current("docs-aws-resource-eip") %>>
+					<a href="/docs/providers/aws/r/eip.html">aws_eip</a>
+                    </li>
+
                     <li<%= sidebar_current("docs-aws-resource-route53-record") %>>
 					<a href="/docs/providers/aws/r/route53_record.html">aws_route53_record</a>
 					</li>