diff --git a/builtin/providers/aws/resource_aws_eip.go b/builtin/providers/aws/resource_aws_eip.go
index 5f52e8619..1cd136782 100644
--- a/builtin/providers/aws/resource_aws_eip.go
+++ b/builtin/providers/aws/resource_aws_eip.go
@@ -219,7 +219,7 @@ func resourceAwsEipUpdate(d *schema.ResourceData, meta interface{}) error {
 
 		log.Printf("[DEBUG] EIP associate configuration: %s (domain: %s)", assocOpts, domain)
 
-		err := resource.Retry(1*time.Minute, func() *resource.RetryError {
+		err := resource.Retry(5*time.Minute, func() *resource.RetryError {
 			_, err := ec2conn.AssociateAddress(assocOpts)
 			if err != nil {
 				if awsErr, ok := err.(awserr.Error); ok {