diff --git a/builtin/providers/aws/resource_aws_lambda_function.go b/builtin/providers/aws/resource_aws_lambda_function.go
index 1c6e706b1..f54bc1a2e 100644
--- a/builtin/providers/aws/resource_aws_lambda_function.go
+++ b/builtin/providers/aws/resource_aws_lambda_function.go
@@ -98,6 +98,10 @@ func resourceAwsLambdaFunction() *schema.Resource {
 							Elem:     &schema.Schema{Type: schema.TypeString},
 							Set:      schema.HashString,
 						},
+						"vpc_id": &schema.Schema{
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -249,7 +253,11 @@ func resourceAwsLambdaFunctionRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("runtime", function.Runtime)
 	d.Set("timeout", function.Timeout)
 	if config := flattenLambdaVpcConfigResponse(function.VpcConfig); len(config) > 0 {
-		d.Set("vpc_config", config)
+		log.Printf("[INFO] Setting Lambda %s VPC config %#v from API", d.Id(), config)
+		err := d.Set("vpc_config", config)
+		if err != nil {
+			return fmt.Errorf("Failed setting vpc_config: %s", err)
+		}
 	}
 	d.Set("source_code_hash", function.CodeSha256)