diff --git a/website/source/docs/builders/openstack.html.markdown b/website/source/docs/builders/openstack.html.markdown
new file mode 100644
index 000000000..409260ca2
--- /dev/null
+++ b/website/source/docs/builders/openstack.html.markdown
@@ -0,0 +1,77 @@
+---
+layout: "docs"
+---
+
+# OpenStack Builder
+
+Type: `openstack`
+
+The `openstack` builder is able to create new images for use with
+[OpenStack](http://www.openstack.org). The builder takes a source
+image, runs any provisioning necessary on the image after launching it,
+then creates a new reusable image. This reusable image can then be
+used as the foundation of new servers that are launched within OpenStack.
+The builder will create temporary keypairs that provide temporary access to
+the server while the image is being created. This simplifies configuration
+quite a bit.
+
+The builder does _not_ manage images. Once it creates an image, it is up to
+you to use it or delete it.
+
+## Configuration Reference
+
+There are many configuration options available for the builder. They are
+segmented below into two categories: required and optional parameters. Within
+each category, the available configuration keys are alphabetized.
+
+Required:
+
+* `flavor` (string) - The ID or full URL for the desired flavor for the
+  server to be created.
+
+* `image_name` (string) - The name of the resulting image.
+
+* `password` (string) - The password used to connect to the OpenStack service.
+  If not specified, Packer will attempt to read this from the
+  `SDK_PASSWORD` environment variable.
+
+* `provider` (string) - The provider used to connect to the OpenStack service.
+  If not specified, Packer will attempt to read this from the
+  `SDK_PROVIDER` environment variable.
+
+* `source_image` (string) - The ID or full URL to the base image to use.
+  This is the image that will be used to launch a new server and provision it.
+
+* `username` (string) - The username used to connect to the OpenStack service.
+  If not specified, Packer will attempt to read this from the
+  `SDK_USERNAME` environment variable.
+
+Optional:
+
+* `ssh_port` (int) - The port that SSH will be available on. Defaults to port
+  22.
+
+* `ssh_timeout` (string) - The time to wait for SSH to become available
+  before timing out. The format of this value is a duration such as "5s"
+  or "5m". The default SSH timeout is "1m".
+
+* `ssh_username` (string) - The username to use in order to communicate
+  over SSH to the running droplet. The default is "root".
+
+## Basic Example
+
+Here is a basic example. This is a working example to build a
+Ubuntu 12.04 LTS (Precise Pangolin) on Rackspace OpenStack cloud offering.
+
+<pre class="prettyprint">
+{
+  "type": "openstack",
+  "username": "",
+  "password": "",
+  "provider": "",
+  "ssh_username": "root",
+  "image_name": "Test image",
+  "source_image": "23b564c9-c3e6-49f9-bc68-86c7a9ab5018",
+  "flavor": "2"
+}
+</pre>
diff --git a/website/source/layouts/docs.erb b/website/source/layouts/docs.erb
index 4db164706..e6efdf4d3 100644
--- a/website/source/layouts/docs.erb
+++ b/website/source/layouts/docs.erb
@@ -32,6 +32,7 @@
 			<li><h4>Builders</h4></li>
 			<li><a href="/docs/builders/amazon.html">Amazon EC2 (AMI)</a></li>
 			<li><a href="/docs/builders/digitalocean.html">DigitalOcean</a></li>
+			<li><a href="/docs/builders/openstack.html">OpenStack</a></li>
 			<li><a href="/docs/builders/virtualbox.html">VirtualBox</a></li>
 			<li><a href="/docs/builders/vmware.html">VMware</a></li>
 			<li><a href="/docs/builders/custom.html">Custom</a></li>