diff --git a/aws/resource_aws_gamelift_fleet.go b/aws/resource_aws_gamelift_fleet.go
index 11b088cb4ba..ac985289517 100644
--- a/aws/resource_aws_gamelift_fleet.go
+++ b/aws/resource_aws_gamelift_fleet.go
@@ -22,7 +22,7 @@ func resourceAwsGameliftFleet() *schema.Resource {
 
 		Timeouts: &schema.ResourceTimeout{
 			Create: schema.DefaultTimeout(70 * time.Minute),
-			Delete: schema.DefaultTimeout(5 * time.Minute),
+			Delete: schema.DefaultTimeout(20 * time.Minute),
 		},
 
 		Schema: map[string]*schema.Schema{
diff --git a/website/docs/r/gamelift_fleet.html.markdown b/website/docs/r/gamelift_fleet.html.markdown
index 31867f428a3..f5c13031ac4 100644
--- a/website/docs/r/gamelift_fleet.html.markdown
+++ b/website/docs/r/gamelift_fleet.html.markdown
@@ -74,6 +74,13 @@ In addition to all arguments above, the following attributes are exported:
 * `arn` - Fleet ARN.
 * `operating_system` - Operating system of the fleet's computing resources.
 
+## Timeouts
+
+`aws_gamelift_fleet` provides the following [Timeouts](/docs/configuration/resources.html#timeouts) configuration options:
+
+* `create` - (Default `70m`) How long to wait for a fleet to be created.
+* `delete` - (Default `20m`) How long to wait for a fleet to be deleted.
+
 ## Import
 
 Gamelift Fleets cannot be imported at this time.