diff --git a/builtin/providers/aws/resource_aws_api_gateway_domain_name.go b/builtin/providers/aws/resource_aws_api_gateway_domain_name.go
index 45b54b8cc..a2b88e99c 100644
--- a/builtin/providers/aws/resource_aws_api_gateway_domain_name.go
+++ b/builtin/providers/aws/resource_aws_api_gateway_domain_name.go
@@ -52,6 +52,11 @@ func resourceAwsApiGatewayDomainName() *schema.Resource {
 				Computed: true,
 			},
 
+			"certificate_upload_date": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+
 			"cloudfront_zone_id": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
diff --git a/builtin/providers/aws/resource_aws_api_gateway_domain_name_test.go b/builtin/providers/aws/resource_aws_api_gateway_domain_name_test.go
index 76fc3c108..0beb75726 100644
--- a/builtin/providers/aws/resource_aws_api_gateway_domain_name_test.go
+++ b/builtin/providers/aws/resource_aws_api_gateway_domain_name_test.go
@@ -41,6 +41,9 @@ func TestAccAWSAPIGatewayDomainName_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(
 						"aws_api_gateway_domain_name.test", "domain_name", name,
 					),
+					resource.TestCheckResourceAttrSet(
+						"aws_api_gateway_domain_name.test", "certificate_upload_date",
+					),
 				),
 			},
 		},
diff --git a/website/source/docs/providers/aws/r/api_gateway_domain_name.html.markdown b/website/source/docs/providers/aws/r/api_gateway_domain_name.html.markdown
index 27f1354a4..049da5b72 100644
--- a/website/source/docs/providers/aws/r/api_gateway_domain_name.html.markdown
+++ b/website/source/docs/providers/aws/r/api_gateway_domain_name.html.markdown
@@ -69,6 +69,7 @@ The following arguments are supported:
 The following attributes are exported:
 
 * `id` - The internal id assigned to this domain name by API Gateway.
+* `certificate_upload_date` - The upload date associated with the domain certificate.
 * `cloudfront_domain_name` - The hostname created by Cloudfront to represent
   the distribution that implements this domain name mapping.
 * `cloudfront_zone_id` - For convenience, the hosted zone id (`Z2FDTNDATAQYW2`)