diff --git a/aws/data_source_aws_lb_listener_test.go b/aws/data_source_aws_lb_listener_test.go
index f4117b0ea41..a2bbc6eac94 100644
--- a/aws/data_source_aws_lb_listener_test.go
+++ b/aws/data_source_aws_lb_listener_test.go
@@ -89,7 +89,7 @@ func TestAccDataSourceAWSLBListener_https(t *testing.T) {
 					resource.TestCheckResourceAttr("data.aws_lb_listener.front_end", "port", "443"),
 					resource.TestCheckResourceAttr("data.aws_lb_listener.front_end", "default_action.#", "1"),
 					resource.TestCheckResourceAttr("data.aws_lb_listener.front_end", "default_action.0.type", "forward"),
-					resource.TestCheckResourceAttr("data.aws_lb_listener.front_end", "ssl_policy", "ELBSecurityPolicy-2015-05"),
+					resource.TestCheckResourceAttr("data.aws_lb_listener.front_end", "ssl_policy", "ELBSecurityPolicy-2016-08"),
 					resource.TestCheckResourceAttrSet("data.aws_lb_listener.from_lb_and_port", "load_balancer_arn"),
 					resource.TestCheckResourceAttrSet("data.aws_lb_listener.from_lb_and_port", "arn"),
 					resource.TestCheckResourceAttrSet("data.aws_lb_listener.from_lb_and_port", "default_action.0.target_group_arn"),
@@ -98,7 +98,7 @@ func TestAccDataSourceAWSLBListener_https(t *testing.T) {
 					resource.TestCheckResourceAttr("data.aws_lb_listener.from_lb_and_port", "port", "443"),
 					resource.TestCheckResourceAttr("data.aws_lb_listener.from_lb_and_port", "default_action.#", "1"),
 					resource.TestCheckResourceAttr("data.aws_lb_listener.from_lb_and_port", "default_action.0.type", "forward"),
-					resource.TestCheckResourceAttr("data.aws_lb_listener.from_lb_and_port", "ssl_policy", "ELBSecurityPolicy-2015-05"),
+					resource.TestCheckResourceAttr("data.aws_lb_listener.from_lb_and_port", "ssl_policy", "ELBSecurityPolicy-2016-08"),
 				),
 			},
 		},
@@ -336,7 +336,7 @@ resource "aws_lb_listener" "front_end" {
   load_balancer_arn = "${aws_lb.alb_test.id}"
   protocol          = "HTTPS"
   port              = "443"
-  ssl_policy        = "ELBSecurityPolicy-2015-05"
+  ssl_policy        = "ELBSecurityPolicy-2016-08"
   certificate_arn   = "${aws_iam_server_certificate.test_cert.arn}"
 
   default_action {
diff --git a/aws/resource_aws_lb_listener_certificate_test.go b/aws/resource_aws_lb_listener_certificate_test.go
index 3fcababb5fa..25bf048e261 100644
--- a/aws/resource_aws_lb_listener_certificate_test.go
+++ b/aws/resource_aws_lb_listener_certificate_test.go
@@ -211,7 +211,7 @@ resource "aws_lb_listener" "test" {
   load_balancer_arn = "${aws_lb.test.arn}"
   port              = "443"
   protocol          = "HTTPS"
-  ssl_policy        = "ELBSecurityPolicy-2015-05"
+  ssl_policy        = "ELBSecurityPolicy-2016-08"
   certificate_arn   = "${aws_iam_server_certificate.default.arn}"
 
   default_action {
diff --git a/aws/resource_aws_lb_listener_rule_test.go b/aws/resource_aws_lb_listener_rule_test.go
index d648a54c97d..282fd7e2308 100644
--- a/aws/resource_aws_lb_listener_rule_test.go
+++ b/aws/resource_aws_lb_listener_rule_test.go
@@ -1654,7 +1654,7 @@ resource "aws_lb_listener" "front_end" {
    load_balancer_arn = "${aws_lb.alb_test.id}"
    protocol = "HTTPS"
    port = "443"
-   ssl_policy = "ELBSecurityPolicy-2015-05"
+   ssl_policy = "ELBSecurityPolicy-2016-08"
    certificate_arn = "${aws_iam_server_certificate.test.arn}"
 
    default_action {
@@ -1832,7 +1832,7 @@ resource "aws_lb_listener" "front_end" {
    load_balancer_arn = "${aws_lb.alb_test.id}"
    protocol = "HTTPS"
    port = "443"
-   ssl_policy = "ELBSecurityPolicy-2015-05"
+   ssl_policy = "ELBSecurityPolicy-2016-08"
    certificate_arn = "${aws_iam_server_certificate.test.arn}"
 
    default_action {
@@ -1997,7 +1997,7 @@ resource "aws_lb_listener" "test" {
   load_balancer_arn = "${aws_lb.test.id}"
   protocol          = "HTTPS"
   port              = "443"
-  ssl_policy        = "ELBSecurityPolicy-2015-05"
+  ssl_policy        = "ELBSecurityPolicy-2016-08"
   certificate_arn   = "${aws_iam_server_certificate.test.arn}"
 
   default_action {
diff --git a/aws/resource_aws_lb_listener_test.go b/aws/resource_aws_lb_listener_test.go
index ea0c26c9c8e..4b805fa7d61 100644
--- a/aws/resource_aws_lb_listener_test.go
+++ b/aws/resource_aws_lb_listener_test.go
@@ -100,7 +100,7 @@ func TestAccAWSLBListener_https(t *testing.T) {
 					resource.TestCheckResourceAttr("aws_lb_listener.front_end", "default_action.0.redirect.#", "0"),
 					resource.TestCheckResourceAttr("aws_lb_listener.front_end", "default_action.0.fixed_response.#", "0"),
 					resource.TestCheckResourceAttrSet("aws_lb_listener.front_end", "certificate_arn"),
-					resource.TestCheckResourceAttr("aws_lb_listener.front_end", "ssl_policy", "ELBSecurityPolicy-2015-05"),
+					resource.TestCheckResourceAttr("aws_lb_listener.front_end", "ssl_policy", "ELBSecurityPolicy-2016-08"),
 				),
 			},
 		},
@@ -584,7 +584,7 @@ func testAccAWSLBListenerConfig_https(lbName, targetGroupName string) string {
    load_balancer_arn = "${aws_lb.alb_test.id}"
    protocol = "HTTPS"
    port = "443"
-   ssl_policy = "ELBSecurityPolicy-2015-05"
+   ssl_policy = "ELBSecurityPolicy-2016-08"
    certificate_arn = "${aws_iam_server_certificate.test_cert.arn}"
 
    default_action {
@@ -1004,7 +1004,7 @@ resource "aws_lb_listener" "test" {
   load_balancer_arn = "${aws_lb.test.id}"
   protocol = "HTTPS"
   port = "443"
-  ssl_policy = "ELBSecurityPolicy-2015-05"
+  ssl_policy = "ELBSecurityPolicy-2016-08"
   certificate_arn = "${aws_iam_server_certificate.test.arn}"
 
   default_action {
@@ -1131,7 +1131,7 @@ resource "aws_lb_listener" "test" {
   load_balancer_arn = "${aws_lb.test.id}"
   protocol = "HTTPS"
   port = "443"
-  ssl_policy = "ELBSecurityPolicy-2015-05"
+  ssl_policy = "ELBSecurityPolicy-2016-08"
   certificate_arn = "${aws_iam_server_certificate.test.arn}"
 
   default_action {
@@ -1170,7 +1170,7 @@ resource "aws_lb_listener" "test" {
   load_balancer_arn = "${aws_lb.test.id}"
   protocol          = "HTTPS"
   port              = "443"
-  ssl_policy        = "ELBSecurityPolicy-2015-05"
+  ssl_policy        = "ELBSecurityPolicy-2016-08"
   certificate_arn   = "${aws_iam_server_certificate.test.arn}"
 
   default_action {
diff --git a/website/docs/r/lb_listener.html.markdown b/website/docs/r/lb_listener.html.markdown
index 7b636fdea7f..2bdfea65ca4 100644
--- a/website/docs/r/lb_listener.html.markdown
+++ b/website/docs/r/lb_listener.html.markdown
@@ -29,7 +29,7 @@ resource "aws_lb_listener" "front_end" {
   load_balancer_arn = "${aws_lb.front_end.arn}"
   port              = "443"
   protocol          = "HTTPS"
-  ssl_policy        = "ELBSecurityPolicy-2015-05"
+  ssl_policy        = "ELBSecurityPolicy-2016-08"
   certificate_arn   = "arn:aws:iam::187416307283:server-certificate/test_cert_rab3wuqwgja25ct3n4jdj2tzu4"
 
   default_action {