diff --git a/builtin/providers/aws/provider.go b/builtin/providers/aws/provider.go
index 2a5fff987..f1f920f52 100644
--- a/builtin/providers/aws/provider.go
+++ b/builtin/providers/aws/provider.go
@@ -86,7 +86,6 @@ func Provider() terraform.ResourceProvider {
 			"aws_app_cookie_stickiness_policy": resourceAwsAppCookieStickinessPolicy(),
 			"aws_autoscaling_group":            resourceAwsAutoscalingGroup(),
 			"aws_autoscaling_notification":     resourceAwsAutoscalingNotification(),
-			"aws_flow_log":                     resourceAwsFlowLog(),
 			"aws_customer_gateway":             resourceAwsCustomerGateway(),
 			"aws_db_instance":                  resourceAwsDbInstance(),
 			"aws_db_parameter_group":           resourceAwsDbParameterGroup(),
@@ -102,6 +101,7 @@ func Provider() terraform.ResourceProvider {
 			"aws_elasticache_security_group":   resourceAwsElasticacheSecurityGroup(),
 			"aws_elasticache_subnet_group":     resourceAwsElasticacheSubnetGroup(),
 			"aws_elb":                          resourceAwsElb(),
+			"aws_flow_log":                     resourceAwsFlowLog(),
 			"aws_iam_access_key":               resourceAwsIamAccessKey(),
 			"aws_iam_group_policy":             resourceAwsIamGroupPolicy(),
 			"aws_iam_group":                    resourceAwsIamGroup(),
diff --git a/builtin/providers/aws/resource_aws_flow_log.go b/builtin/providers/aws/resource_aws_flow_log.go
index f2bb09890..5e70ea48c 100644
--- a/builtin/providers/aws/resource_aws_flow_log.go
+++ b/builtin/providers/aws/resource_aws_flow_log.go
@@ -17,12 +17,6 @@ func resourceAwsFlowLog() *schema.Resource {
 		Delete: resourceAwsLogFlowDelete,
 
 		Schema: map[string]*schema.Schema{
-			// "client_token": &schema.Schema{
-			// 	Type:     schema.TypeString,
-			// 	Optional: true,
-			// 	Computed: true,
-			// },
-
 			"iam_role_arn": &schema.Schema{
 				Type:     schema.TypeString,
 				Required: true,
@@ -31,8 +25,8 @@ func resourceAwsFlowLog() *schema.Resource {
 
 			"log_group_name": &schema.Schema{
 				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
+                                Required: true,
+                                ForceNew: true,
 			},
 
 			"vpc_id": &schema.Schema{