diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go
index 0ab2919fd..8c9cbd5d3 100644
--- a/builtin/providers/aws/provider.go
+++ b/builtin/providers/aws/provider.go
@@ -67,6 +67,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_subnet":                       resourceAwsSubnet(),
 			"aws_vpc":                          resourceAwsVpc(),
 			"aws_vpc_peering_connection":       resourceAwsVpcPeeringConnection(),
+			"aws_vpn_gateway":                  resourceAwsVpnGateway(),
 		},
 
 		ConfigureFunc: providerConfigure,
diff --git a/builtin/providers/aws/resource_aws_vpn_gateway.go b/builtin/providers/aws/resource_aws_vpn_gateway.go
index 4bf73b975..9e85540ef 100644
--- a/builtin/providers/aws/resource_aws_vpn_gateway.go
+++ b/builtin/providers/aws/resource_aws_vpn_gateway.go
@@ -27,7 +27,8 @@ func resourceAwsVpnGateway() *schema.Resource {
 
 			"type": &schema.Schema{
 				Type:     schema.TypeString,
-                Required: true,
+                Default:  "ipsec.1",
+                Optional: true,
 				ForceNew: true,
 			},
 
@@ -36,6 +37,8 @@ func resourceAwsVpnGateway() *schema.Resource {
                 Optional: true,
             },
 
+            "tags": tagsSchema(),
+
 		},
 	}
 }
diff --git a/builtin/providers/aws/resource_aws_vpn_gateway_test.go b/builtin/providers/aws/resource_aws_vpn_gateway_test.go
new file mode 100644
index 000000000..25ab24ebc
--- /dev/null
+++ b/builtin/providers/aws/resource_aws_vpn_gateway_test.go
@@ -0,0 +1,231 @@
+package aws
+
+import (
+	"fmt"
+	"testing"
+
+    "github.com/hashicorp/aws-sdk-go/aws"
+    "github.com/hashicorp/aws-sdk-go/gen/ec2"
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+)
+
+func TestAccAWSVpnGateway(t *testing.T) {
+	var v, v2 ec2.VPNGateway
+
+	testNotEqual := func(*terraform.State) error {
+		if len(v.VPCAttachments) == 0 {
+			return fmt.Errorf("VPN gateway A is not attached")
+		}
+		if len(v2.VPCAttachments) == 0 {
+			return fmt.Errorf("VPN gateway B is not attached")
+		}
+
+		id1 := v.VPCAttachments[0].VPCID
+		id2 := v2.VPCAttachments[0].VPCID
+		if id1 == id2 {
+			return fmt.Errorf("Both attachment IDs are the same")
+		}
+
+		return nil
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckVpnGatewayDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccVpnGatewayConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVpnGatewayExists(
+						"aws_vpn_gateway.foo", &v),
+				),
+			},
+
+			resource.TestStep{
+				Config: testAccVpnGatewayConfigChangeVPC,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVpnGatewayExists(
+						"aws_vpn_gateway.foo", &v2),
+					testNotEqual,
+				),
+			},
+		},
+	})
+}
+
+func TestAccAWSVpnGateway_delete(t *testing.T) {
+	var vpnGateway ec2.VPNGateway
+
+	testDeleted := func(r string) resource.TestCheckFunc {
+		return func(s *terraform.State) error {
+			_, ok := s.RootModule().Resources[r]
+			if ok {
+				return fmt.Errorf("VPN Gateway %q should have been deleted", r)
+			}
+			return nil
+		}
+	}
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckVpnGatewayDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccVpnGatewayConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVpnGatewayExists("aws_vpn_gateway.foo", &vpnGateway)),
+			},
+			resource.TestStep{
+				Config: testAccNoVpnGatewayConfig,
+				Check:  resource.ComposeTestCheckFunc(testDeleted("aws_vpn_gateway.foo")),
+			},
+		},
+	})
+}
+
+func TestAccVpnGateway_tags(t *testing.T) {
+	var v ec2.VPNGateway
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckVpnGatewayDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: testAccCheckVpnGatewayConfigTags,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVpnGatewayExists("aws_vpn_gateway.foo", &v),
+				),
+			},
+
+			resource.TestStep{
+				Config: testAccCheckVpnGatewayConfigTagsUpdate,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckVpnGatewayExists("aws_vpn_gateway.foo", &v),
+					testAccCheckTagsSDK(&v.Tags, "foo", ""),
+					testAccCheckTagsSDK(&v.Tags, "bar", "baz"),
+				),
+			},
+		},
+	})
+}
+
+func testAccCheckVpnGatewayDestroy(s *terraform.State) error {
+    conn := testAccProvider.Meta().(*AWSClient).awsEC2conn
+
+	for _, rs := range s.RootModule().Resources {
+		if rs.Type != "aws_vpn_gateway" {
+			continue
+		}
+
+		// Try to find the resource
+		resp, err := conn.DescribeVPNGateways(&ec2.DescribeVPNGatewaysRequest{
+            VPNGatewayIDs: []string{rs.Primary.ID},
+        })
+		if err == nil {
+			if len(resp.VPNGateways) > 0 {
+				return fmt.Errorf("still exists")
+			}
+
+			return nil
+		}
+
+		// Verify the error is what we want
+		ec2err, ok := err.(*aws.APIError)
+		if !ok {
+			return err
+		}
+		if ec2err.Code != "InvalidVpnGatewayID.NotFound" {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func testAccCheckVpnGatewayExists(n string, ig *ec2.VPNGateway) resource.TestCheckFunc {
+	return func(s *terraform.State) error {
+		rs, ok := s.RootModule().Resources[n]
+		if !ok {
+			return fmt.Errorf("Not found: %s", n)
+		}
+
+		if rs.Primary.ID == "" {
+			return fmt.Errorf("No ID is set")
+		}
+
+        conn := testAccProvider.Meta().(*AWSClient).awsEC2conn
+		resp, err := conn.DescribeVPNGateways(&ec2.DescribeVPNGatewaysRequest{
+            VPNGatewayIDs: []string{rs.Primary.ID},
+        })
+		if err != nil {
+			return err
+		}
+		if len(resp.VPNGateways) == 0 {
+			return fmt.Errorf("VPNGateway not found")
+		}
+
+		*ig = resp.VPNGateways[0]
+
+		return nil
+	}
+}
+
+const testAccNoVpnGatewayConfig = `
+resource "aws_vpc" "foo" {
+	cidr_block = "10.1.0.0/16"
+}
+`
+
+const testAccVpnGatewayConfig = `
+resource "aws_vpc" "foo" {
+	cidr_block = "10.1.0.0/16"
+}
+
+resource "aws_vpn_gateway" "foo" {
+	vpc_id = "${aws_vpc.foo.id}"
+}
+`
+
+const testAccVpnGatewayConfigChangeVPC = `
+resource "aws_vpc" "foo" {
+	cidr_block = "10.1.0.0/16"
+}
+
+resource "aws_vpc" "bar" {
+	cidr_block = "10.2.0.0/16"
+}
+
+resource "aws_vpn_gateway" "foo" {
+	vpc_id = "${aws_vpc.bar.id}"
+}
+`
+
+const testAccCheckVpnGatewayConfigTags = `
+resource "aws_vpc" "foo" {
+	cidr_block = "10.1.0.0/16"
+}
+
+resource "aws_vpn_gateway" "foo" {
+	vpc_id = "${aws_vpc.foo.id}"
+	tags {
+		foo = "bar"
+	}
+}
+`
+
+const testAccCheckVpnGatewayConfigTagsUpdate = `
+resource "aws_vpc" "foo" {
+	cidr_block = "10.1.0.0/16"
+}
+
+resource "aws_vpn_gateway" "foo" {
+	vpc_id = "${aws_vpc.foo.id}"
+	tags {
+		bar = "baz"
+	}
+}
+`