diff --git a/builtin/providers/aws/resource_aws_subnet.go b/builtin/providers/aws/resource_aws_subnet.go
new file mode 100644
index 000000000..b3fefc0ec
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_subnet.go
@@ -0,0 +1,152 @@
+package aws
+
+import (
+	"fmt"
+	"log"
+	"time"
+
+	"github.com/hashicorp/terraform/helper/diff"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+	"github.com/mitchellh/goamz/ec2"
+)
+
+func resource_aws_subnet_create(
+	s *terraform.ResourceState,
+	d *terraform.ResourceDiff,
+	meta interface{}) (*terraform.ResourceState, error) {
+	p := meta.(*ResourceProvider)
+	ec2conn := p.ec2conn
+
+	// Merge the diff so that we have all the proper attributes
+	s = s.MergeDiff(d)
+
+	// Create the Subnet
+	createOpts := &ec2.CreateSubnet{
+		AvailabilityZone: s.Attributes["availability_zone"],
+		CidrBlock:        s.Attributes["cidr_block"],
+		VpcId:            s.Attributes["vpc_id"],
+	}
+	log.Printf("[DEBUG] Subnet create config: %#v", createOpts)
+	resp, err := ec2conn.CreateSubnet(createOpts)
+	if err != nil {
+		return nil, fmt.Errorf("Error creating subnet: %s", resp)
+	}
+
+	// Get the ID and store it
+	subnet := &resp.Subnet
+	s.ID = subnet.SubnetId
+	log.Printf("[INFO] Subnet ID: %s", s.ID)
+
+	// Wait for the Subnet to become available
+	log.Printf(
+		"[DEBUG] Waiting for subnet (%s) to become available",
+		s.ID)
+	stateConf := &resource.StateChangeConf{
+		Pending: []string{"pending"},
+		Target:  "available",
+		Refresh: SubnetStateRefreshFunc(ec2conn, s.ID),
+		Timeout: 10 * time.Minute,
+	}
+	subnetRaw, err := stateConf.WaitForState()
+	if err != nil {
+		return s, fmt.Errorf(
+			"Error waiting for subnet (%s) to become available: %s",
+			s.ID, err)
+	}
+
+	// Update our attributes and return
+	return resource_aws_subnet_update_state(s, subnetRaw.(*ec2.Subnet))
+}
+
+func resource_aws_subnet_update(
+	s *terraform.ResourceState,
+	d *terraform.ResourceDiff,
+	meta interface{}) (*terraform.ResourceState, error) {
+	// This should never be called because we have no update-able
+	// attributes
+	panic("Update for subnet is not supported")
+
+	return nil, nil
+}
+
+func resource_aws_subnet_destroy(
+	s *terraform.ResourceState,
+	meta interface{}) error {
+	p := meta.(*ResourceProvider)
+	ec2conn := p.ec2conn
+
+	log.Printf("[INFO] Deleting Subnet: %s", s.ID)
+	if _, err := ec2conn.DeleteSubnet(s.ID); err != nil {
+		return fmt.Errorf("Error deleting subnet: %s", err)
+	}
+
+	return nil
+}
+
+func resource_aws_subnet_refresh(
+	s *terraform.ResourceState,
+	meta interface{}) (*terraform.ResourceState, error) {
+	p := meta.(*ResourceProvider)
+	ec2conn := p.ec2conn
+
+	subnetRaw, _, err := SubnetStateRefreshFunc(ec2conn, s.ID)()
+	if err != nil {
+		return s, err
+	}
+	if subnetRaw == nil {
+		return nil, nil
+	}
+
+	subnet := subnetRaw.(*ec2.Subnet)
+	return resource_aws_subnet_update_state(s, subnet)
+}
+
+func resource_aws_subnet_diff(
+	s *terraform.ResourceState,
+	c *terraform.ResourceConfig,
+	meta interface{}) (*terraform.ResourceDiff, error) {
+	b := &diff.ResourceBuilder{
+		Attrs: map[string]diff.AttrType{
+			"availability_zone": diff.AttrTypeCreate,
+			"cidr_block":        diff.AttrTypeCreate,
+			"vpc_id":            diff.AttrTypeCreate,
+		},
+	}
+
+	return b.Diff(s, c)
+}
+
+func resource_aws_subnet_update_state(
+	s *terraform.ResourceState,
+	subnet *ec2.Subnet) (*terraform.ResourceState, error) {
+	s.Attributes["availability_zone"] = subnet.AvailabilityZone
+	s.Attributes["cidr_block"] = subnet.CidrBlock
+	s.Attributes["vpc_id"] = subnet.VpcId
+	return s, nil
+}
+
+// SubnetStateRefreshFunc returns a resource.StateRefreshFunc that is used to watch
+// a Subnet.
+func SubnetStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		resp, err := conn.DescribeSubnets([]string{id}, ec2.NewFilter())
+		if err != nil {
+			if ec2err, ok := err.(*ec2.Error); ok && ec2err.Code == "InvalidSubnetID.NotFound" {
+				resp = nil
+			} else {
+				log.Printf("Error on SubnetStateRefresh: %s", err)
+				return nil, "", err
+			}
+		}
+
+		if resp == nil {
+			// Sometimes AWS just has consistency issues and doesn't see
+			// our instance yet. Return an empty state.
+			return nil, "", nil
+		}
+
+		subnet := &resp.Subnets[0]
+		return subnet, subnet.State, nil
+	}
+}
diff --git a/builtin/providers/aws/resources.go b/builtin/providers/aws/resources.go
index 1e8a45c48..65389f164 100644
--- a/builtin/providers/aws/resources.go
+++ b/builtin/providers/aws/resources.go
@@ -33,6 +33,13 @@ func init() {
 				Refresh: resource_aws_instance_refresh,
 			},
 
+			"aws_subnet": resource.Resource{
+				Create:  resource_aws_subnet_create,
+				Destroy: resource_aws_subnet_destroy,
+				Diff:    resource_aws_subnet_diff,
+				Refresh: resource_aws_subnet_refresh,
+			},
+
 			"aws_vpc": resource.Resource{
 				Create:  resource_aws_vpc_create,
 				Destroy: resource_aws_vpc_destroy,