diff --git a/builtin/providers/aws/resource_aws_security_group.go b/builtin/providers/aws/resource_aws_security_group.go
index 4a74550e8..6621ea8e7 100644
--- a/builtin/providers/aws/resource_aws_security_group.go
+++ b/builtin/providers/aws/resource_aws_security_group.go
@@ -7,8 +7,8 @@ import (
 	"sort"
 	"time"
 
-	"github.com/hashicorp/aws-sdk-go/aws"
-	"github.com/hashicorp/aws-sdk-go/gen/ec2"
+	"github.com/awslabs/aws-sdk-go/aws"
+	"github.com/awslabs/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/terraform/helper/hashcode"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -142,9 +142,9 @@ func resourceAwsSecurityGroup() *schema.Resource {
 }
 
 func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) error {
-	ec2conn := meta.(*AWSClient).ec2conn
+	conn := meta.(*AWSClient).ec2SDKconn
 
-	securityGroupOpts := &ec2.CreateSecurityGroupRequest{
+	securityGroupOpts := &ec2.CreateSecurityGroupInput{
 		GroupName: aws.String(d.Get("name").(string)),
 	}
 
@@ -158,7 +158,7 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er
 
 	log.Printf(
 		"[DEBUG] Security Group create configuration: %#v", securityGroupOpts)
-	createResp, err := ec2conn.CreateSecurityGroup(securityGroupOpts)
+	createResp, err := conn.CreateSecurityGroup(securityGroupOpts)
 	if err != nil {
 		return fmt.Errorf("Error creating Security Group: %s", err)
 	}
@@ -174,7 +174,7 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er
 	stateConf := &resource.StateChangeConf{
 		Pending: []string{""},
 		Target:  "exists",
-		Refresh: SGStateRefreshFunc(ec2conn, d.Id()),
+		Refresh: SGStateRefreshFunc(conn, d.Id()),
 		Timeout: 1 * time.Minute,
 	}
 	if _, err := stateConf.WaitForState(); err != nil {
@@ -187,9 +187,9 @@ func resourceAwsSecurityGroupCreate(d *schema.ResourceData, meta interface{}) er
 }
 
 func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) error {
-	ec2conn := meta.(*AWSClient).ec2conn
+	conn := meta.(*AWSClient).ec2SDKconn
 
-	sgRaw, _, err := SGStateRefreshFunc(ec2conn, d.Id())()
+	sgRaw, _, err := SGStateRefreshFunc(conn, d.Id())()
 	if err != nil {
 		return err
 	}
@@ -198,7 +198,7 @@ func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) erro
 		return nil
 	}
 
-	sg := sgRaw.(ec2.SecurityGroup)
+	sg := sgRaw.(*ec2.SecurityGroup)
 
 	ingressRules := resourceAwsSecurityGroupIPPermGather(d, sg.IPPermissions)
 	egressRules := resourceAwsSecurityGroupIPPermGather(d, sg.IPPermissionsEgress)
@@ -209,14 +209,14 @@ func resourceAwsSecurityGroupRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("owner_id", sg.OwnerID)
 	d.Set("ingress", ingressRules)
 	d.Set("egress", egressRules)
-	d.Set("tags", tagsToMap(sg.Tags))
+	d.Set("tags", tagsToMapSDK(sg.Tags))
 	return nil
 }
 
 func resourceAwsSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) error {
-	ec2conn := meta.(*AWSClient).ec2conn
+	conn := meta.(*AWSClient).ec2SDKconn
 
-	sgRaw, _, err := SGStateRefreshFunc(ec2conn, d.Id())()
+	sgRaw, _, err := SGStateRefreshFunc(conn, d.Id())()
 	if err != nil {
 		return err
 	}
@@ -225,7 +225,7 @@ func resourceAwsSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) er
 		return nil
 	}
 
-	group := sgRaw.(ec2.SecurityGroup)
+	group := sgRaw.(*ec2.SecurityGroup)
 
 	err = resourceAwsSecurityGroupUpdateRules(d, "ingress", meta, group)
 	if err != nil {
@@ -239,7 +239,7 @@ func resourceAwsSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) er
 		}
 	}
 
-	if err := setTags(ec2conn, d); err != nil {
+	if err := setTagsSDK(conn, d); err != nil {
 		return err
 	}
 
@@ -249,12 +249,12 @@ func resourceAwsSecurityGroupUpdate(d *schema.ResourceData, meta interface{}) er
 }
 
 func resourceAwsSecurityGroupDelete(d *schema.ResourceData, meta interface{}) error {
-	ec2conn := meta.(*AWSClient).ec2conn
+	conn := meta.(*AWSClient).ec2SDKconn
 
 	log.Printf("[DEBUG] Security Group destroy: %v", d.Id())
 
 	return resource.Retry(5*time.Minute, func() error {
-		err := ec2conn.DeleteSecurityGroup(&ec2.DeleteSecurityGroupRequest{
+		_, err := conn.DeleteSecurityGroup(&ec2.DeleteSecurityGroupInput{
 			GroupID: aws.String(d.Id()),
 		})
 		if err != nil {
@@ -317,15 +317,15 @@ func resourceAwsSecurityGroupRuleHash(v interface{}) int {
 	return hashcode.String(buf.String())
 }
 
-func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []ec2.IPPermission) []map[string]interface{} {
+func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []*ec2.IPPermission) []map[string]interface{} {
 	ruleMap := make(map[string]map[string]interface{})
 	for _, perm := range permissions {
-		var fromPort, toPort int
+		var fromPort, toPort *int64
 		if v := perm.FromPort; v != nil {
-			fromPort = *v
+			fromPort = v
 		}
 		if v := perm.ToPort; v != nil {
-			toPort = *v
+			toPort = v
 		}
 
 		k := fmt.Sprintf("%s-%d-%d", *perm.IPProtocol, fromPort, toPort)
@@ -355,7 +355,7 @@ func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []
 
 		var groups []string
 		if len(perm.UserIDGroupPairs) > 0 {
-			groups = flattenSecurityGroups(perm.UserIDGroupPairs)
+			groups = flattenSecurityGroupsSDK(perm.UserIDGroupPairs)
 		}
 		for i, id := range groups {
 			if id == d.Id() {
@@ -384,7 +384,8 @@ func resourceAwsSecurityGroupIPPermGather(d *schema.ResourceData, permissions []
 
 func resourceAwsSecurityGroupUpdateRules(
 	d *schema.ResourceData, ruleset string,
-	meta interface{}, group ec2.SecurityGroup) error {
+	meta interface{}, group *ec2.SecurityGroup) error {
+
 	if d.HasChange(ruleset) {
 		o, n := d.GetChange(ruleset)
 		if o == nil {
@@ -397,8 +398,8 @@ func resourceAwsSecurityGroupUpdateRules(
 		os := o.(*schema.Set)
 		ns := n.(*schema.Set)
 
-		remove := expandIPPerms(group, os.Difference(ns).List())
-		add := expandIPPerms(group, ns.Difference(os).List())
+		remove := expandIPPermsSDK(group, os.Difference(ns).List())
+		add := expandIPPermsSDK(group, ns.Difference(os).List())
 
 		// TODO: We need to handle partial state better in the in-between
 		// in this update.
@@ -410,7 +411,7 @@ func resourceAwsSecurityGroupUpdateRules(
 		// not have service issues.
 
 		if len(remove) > 0 || len(add) > 0 {
-			ec2conn := meta.(*AWSClient).ec2conn
+			conn := meta.(*AWSClient).ec2SDKconn
 
 			var err error
 			if len(remove) > 0 {
@@ -418,17 +419,17 @@ func resourceAwsSecurityGroupUpdateRules(
 					group, ruleset, remove)
 
 				if ruleset == "egress" {
-					req := &ec2.RevokeSecurityGroupEgressRequest{
+					req := &ec2.RevokeSecurityGroupEgressInput{
 						GroupID:       group.GroupID,
 						IPPermissions: remove,
 					}
-					err = ec2conn.RevokeSecurityGroupEgress(req)
+					_, err = conn.RevokeSecurityGroupEgress(req)
 				} else {
-					req := &ec2.RevokeSecurityGroupIngressRequest{
+					req := &ec2.RevokeSecurityGroupIngressInput{
 						GroupID:       group.GroupID,
 						IPPermissions: remove,
 					}
-					err = ec2conn.RevokeSecurityGroupIngress(req)
+					_, err = conn.RevokeSecurityGroupIngress(req)
 				}
 
 				if err != nil {
@@ -443,13 +444,13 @@ func resourceAwsSecurityGroupUpdateRules(
 					group, ruleset, add)
 				// Authorize the new rules
 				if ruleset == "egress" {
-					req := &ec2.AuthorizeSecurityGroupEgressRequest{
+					req := &ec2.AuthorizeSecurityGroupEgressInput{
 						GroupID:       group.GroupID,
 						IPPermissions: add,
 					}
-					err = ec2conn.AuthorizeSecurityGroupEgress(req)
+					_, err = conn.AuthorizeSecurityGroupEgress(req)
 				} else {
-					req := &ec2.AuthorizeSecurityGroupIngressRequest{
+					req := &ec2.AuthorizeSecurityGroupIngressInput{
 						GroupID:       group.GroupID,
 						IPPermissions: add,
 					}
@@ -458,7 +459,7 @@ func resourceAwsSecurityGroupUpdateRules(
 						req.GroupName = group.GroupName
 					}
 
-					err = ec2conn.AuthorizeSecurityGroupIngress(req)
+					_, err = conn.AuthorizeSecurityGroupIngress(req)
 				}
 
 				if err != nil {
@@ -476,8 +477,8 @@ func resourceAwsSecurityGroupUpdateRules(
 // a security group.
 func SGStateRefreshFunc(conn *ec2.EC2, id string) resource.StateRefreshFunc {
 	return func() (interface{}, string, error) {
-		req := &ec2.DescribeSecurityGroupsRequest{
-			GroupIDs: []string{id},
+		req := &ec2.DescribeSecurityGroupsInput{
+			GroupIDs: []*string{aws.String(id)},
 		}
 		resp, err := conn.DescribeSecurityGroups(req)
 		if err != nil {
diff --git a/builtin/providers/aws/resource_aws_security_group_test.go b/builtin/providers/aws/resource_aws_security_group_test.go
index 63d04f813..58908a98a 100644
--- a/builtin/providers/aws/resource_aws_security_group_test.go
+++ b/builtin/providers/aws/resource_aws_security_group_test.go
@@ -2,12 +2,11 @@ package aws
 
 import (
 	"fmt"
-	"log"
 	"reflect"
 	"testing"
 
-	"github.com/hashicorp/aws-sdk-go/aws"
-	"github.com/hashicorp/aws-sdk-go/gen/ec2"
+	"github.com/awslabs/aws-sdk-go/aws"
+	"github.com/awslabs/aws-sdk-go/service/ec2"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 )
@@ -186,7 +185,7 @@ func TestAccAWSSecurityGroup_Change(t *testing.T) {
 }
 
 func testAccCheckAWSSecurityGroupDestroy(s *terraform.State) error {
-	conn := testAccProvider.Meta().(*AWSClient).ec2conn
+	conn := testAccProvider.Meta().(*AWSClient).ec2SDKconn
 
 	for _, rs := range s.RootModule().Resources {
 		if rs.Type != "aws_security_group" {
@@ -194,8 +193,8 @@ func testAccCheckAWSSecurityGroupDestroy(s *terraform.State) error {
 		}
 
 		// Retrieve our group
-		req := &ec2.DescribeSecurityGroupsRequest{
-			GroupIDs: []string{rs.Primary.ID},
+		req := &ec2.DescribeSecurityGroupsInput{
+			GroupIDs: []*string{aws.String(rs.Primary.ID)},
 		}
 		resp, err := conn.DescribeSecurityGroups(req)
 		if err == nil {
@@ -230,9 +229,9 @@ func testAccCheckAWSSecurityGroupExists(n string, group *ec2.SecurityGroup) reso
 			return fmt.Errorf("No Security Group is set")
 		}
 
-		conn := testAccProvider.Meta().(*AWSClient).ec2conn
-		req := &ec2.DescribeSecurityGroupsRequest{
-			GroupIDs: []string{rs.Primary.ID},
+		conn := testAccProvider.Meta().(*AWSClient).ec2SDKconn
+		req := &ec2.DescribeSecurityGroupsInput{
+			GroupIDs: []*string{aws.String(rs.Primary.ID)},
 		}
 		resp, err := conn.DescribeSecurityGroups(req)
 		if err != nil {
@@ -240,10 +239,7 @@ func testAccCheckAWSSecurityGroupExists(n string, group *ec2.SecurityGroup) reso
 		}
 
 		if len(resp.SecurityGroups) > 0 && *resp.SecurityGroups[0].GroupID == rs.Primary.ID {
-
-			log.Printf("\n==\n===\nfound group\n===\n==\n")
-			*group = resp.SecurityGroups[0]
-
+			*group = *resp.SecurityGroups[0]
 			return nil
 		}
 
@@ -253,11 +249,11 @@ func testAccCheckAWSSecurityGroupExists(n string, group *ec2.SecurityGroup) reso
 
 func testAccCheckAWSSecurityGroupAttributes(group *ec2.SecurityGroup) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		p := ec2.IPPermission{
-			FromPort:   aws.Integer(80),
-			ToPort:     aws.Integer(8000),
+		p := &ec2.IPPermission{
+			FromPort:   aws.Long(80),
+			ToPort:     aws.Long(8000),
 			IPProtocol: aws.String("tcp"),
-			IPRanges:   []ec2.IPRange{ec2.IPRange{aws.String("10.0.0.0/8")}},
+			IPRanges:   []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("10.0.0.0/8")}},
 		}
 
 		if *group.GroupName != "terraform_acceptance_test_example" {
@@ -296,7 +292,7 @@ func TestAccAWSSecurityGroup_tags(t *testing.T) {
 				Config: testAccAWSSecurityGroupConfigTags,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSecurityGroupExists("aws_security_group.foo", &group),
-					testAccCheckTags(&group.Tags, "foo", "bar"),
+					testAccCheckTagsSDK(&group.Tags, "foo", "bar"),
 				),
 			},
 
@@ -304,8 +300,8 @@ func TestAccAWSSecurityGroup_tags(t *testing.T) {
 				Config: testAccAWSSecurityGroupConfigTagsUpdate,
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckAWSSecurityGroupExists("aws_security_group.foo", &group),
-					testAccCheckTags(&group.Tags, "foo", ""),
-					testAccCheckTags(&group.Tags, "bar", "baz"),
+					testAccCheckTagsSDK(&group.Tags, "foo", ""),
+					testAccCheckTagsSDK(&group.Tags, "bar", "baz"),
 				),
 			},
 		},
@@ -314,18 +310,25 @@ func TestAccAWSSecurityGroup_tags(t *testing.T) {
 
 func testAccCheckAWSSecurityGroupAttributesChanged(group *ec2.SecurityGroup) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		p := []ec2.IPPermission{
-			ec2.IPPermission{
-				FromPort:   aws.Integer(80),
-				ToPort:     aws.Integer(9000),
+		p := []*ec2.IPPermission{
+			&ec2.IPPermission{
+				FromPort:   aws.Long(80),
+				ToPort:     aws.Long(9000),
 				IPProtocol: aws.String("tcp"),
-				IPRanges:   []ec2.IPRange{ec2.IPRange{aws.String("10.0.0.0/8")}},
+				IPRanges:   []*ec2.IPRange{&ec2.IPRange{CIDRIP: aws.String("10.0.0.0/8")}},
 			},
-			ec2.IPPermission{
-				FromPort:   aws.Integer(80),
-				ToPort:     aws.Integer(8000),
+			&ec2.IPPermission{
+				FromPort:   aws.Long(80),
+				ToPort:     aws.Long(8000),
 				IPProtocol: aws.String("tcp"),
-				IPRanges:   []ec2.IPRange{ec2.IPRange{aws.String("0.0.0.0/0")}, ec2.IPRange{aws.String("10.0.0.0/8")}},
+				IPRanges: []*ec2.IPRange{
+					&ec2.IPRange{
+						CIDRIP: aws.String("0.0.0.0/0"),
+					},
+					&ec2.IPRange{
+						CIDRIP: aws.String("10.0.0.0/8"),
+					},
+				},
 			},
 		}
 
@@ -372,6 +375,10 @@ resource "aws_security_group" "web" {
     to_port = 8000
     cidr_blocks = ["10.0.0.0/8"]
   }
+
+	tags {
+		Name = "tf-acc-test"
+	}
 }
 `
 
diff --git a/builtin/providers/aws/structure_sdk.go b/builtin/providers/aws/structure_sdk.go
index 8a7fdaef6..634a7acc6 100644
--- a/builtin/providers/aws/structure_sdk.go
+++ b/builtin/providers/aws/structure_sdk.go
@@ -3,8 +3,8 @@ package aws
 import (
 	"strings"
 
+	"github.com/awslabs/aws-sdk-go/aws"
 	"github.com/awslabs/aws-sdk-go/service/ec2"
-	"github.com/hashicorp/aws-sdk-go/aws"
 	"github.com/hashicorp/aws-sdk-go/gen/elb"
 	"github.com/hashicorp/aws-sdk-go/gen/rds"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -20,10 +20,12 @@ func expandListenersSDK(configured []interface{}) ([]elb.Listener, error) {
 	for _, lRaw := range configured {
 		data := lRaw.(map[string]interface{})
 
+		ip := data["instance_port"].(int)
+		lp := data["lb_port"].(int)
 		l := elb.Listener{
-			InstancePort:     aws.Integer(data["instance_port"].(int)),
+			InstancePort:     &ip,
 			InstanceProtocol: aws.String(data["instance_protocol"].(string)),
-			LoadBalancerPort: aws.Integer(data["lb_port"].(int)),
+			LoadBalancerPort: &lp,
 			Protocol:         aws.String(data["lb_protocol"].(string)),
 		}
 
@@ -40,7 +42,7 @@ func expandListenersSDK(configured []interface{}) ([]elb.Listener, error) {
 // Takes the result of flatmap.Expand for an array of ingress/egress
 // security group rules and returns EC2 API compatible objects
 func expandIPPermsSDK(
-	group ec2.SecurityGroup, configured []interface{}) []*ec2.IPPermission {
+	group *ec2.SecurityGroup, configured []interface{}) []*ec2.IPPermission {
 	vpc := group.VPCID != nil
 
 	perms := make([]*ec2.IPPermission, len(configured))
@@ -48,8 +50,8 @@ func expandIPPermsSDK(
 		var perm ec2.IPPermission
 		m := mRaw.(map[string]interface{})
 
-		perm.FromPort = aws.Long(m["from_port"].(int64))
-		perm.ToPort = aws.Long(m["to_port"].(int64))
+		perm.FromPort = aws.Long(int64(m["from_port"].(int)))
+		perm.ToPort = aws.Long(int64(m["to_port"].(int)))
 		perm.IPProtocol = aws.String(m["protocol"].(string))
 
 		var groups []string
@@ -141,7 +143,7 @@ func flattenHealthCheckSDK(check *elb.HealthCheck) []map[string]interface{} {
 }
 
 // Flattens an array of UserSecurityGroups into a []string
-func flattenSecurityGroupsSDK(list []ec2.UserIDGroupPair) []string {
+func flattenSecurityGroupsSDK(list []*ec2.UserIDGroupPair) []string {
 	result := make([]string, 0, len(list))
 	for _, g := range list {
 		result = append(result, *g.GroupID)
diff --git a/builtin/providers/aws/structure_test_sdk.go b/builtin/providers/aws/structure_sdk_test.go
similarity index 99%
rename from builtin/providers/aws/structure_test_sdk.go
rename to builtin/providers/aws/structure_sdk_test.go
index b0f945d1e..db4b76c6f 100644
--- a/builtin/providers/aws/structure_test_sdk.go
+++ b/builtin/providers/aws/structure_sdk_test.go
@@ -59,7 +59,7 @@ func TestExpandIPPermsSDK(t *testing.T) {
 			"self":      true,
 		},
 	}
-	group := ec2.SecurityGroup{
+	group := &ec2.SecurityGroup{
 		GroupID: aws.String("foo"),
 		VPCID:   aws.String("bar"),
 	}
@@ -142,7 +142,7 @@ func TestExpandIPPerms_nonVPCSDK(t *testing.T) {
 			"self":      true,
 		},
 	}
-	group := ec2.SecurityGroup{
+	group := &ec2.SecurityGroup{
 		GroupName: aws.String("foo"),
 	}
 	perms := expandIPPermsSDK(group, expanded)
@@ -434,7 +434,7 @@ func TestFlattenAttachmentSDK(t *testing.T) {
 		t.Fatalf("expected instance to be i-00001, but got %s", result["instance"])
 	}
 
-	if result["device_index"] != 1 {
+	if result["device_index"] != int64(1) {
 		t.Fatalf("expected device_index to be 1, but got %d", result["device_index"])
 	}