diff --git a/azurerm/resource_arm_cdn_endpoint.go b/azurerm/resource_arm_cdn_endpoint.go
index f8e14522cfa6..0cbde9cf0be3 100644
--- a/azurerm/resource_arm_cdn_endpoint.go
+++ b/azurerm/resource_arm_cdn_endpoint.go
@@ -81,13 +81,13 @@ func resourceArmCdnEndpoint() *schema.Resource {
 						"http_port": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Computed: true,
+							Default:  80,
 						},
 
 						"https_port": {
 							Type:     schema.TypeInt,
 							Optional: true,
-							Computed: true,
+							Default:  443,
 						},
 					},
 				},
diff --git a/website/docs/r/cdn_endpoint.html.markdown b/website/docs/r/cdn_endpoint.html.markdown
index 7e08922cab78..abd29b551c13 100644
--- a/website/docs/r/cdn_endpoint.html.markdown
+++ b/website/docs/r/cdn_endpoint.html.markdown
@@ -3,7 +3,8 @@ layout: "azurerm"
 page_title: "Azure Resource Manager: azurerm_cdn_endpoint"
 sidebar_current: "docs-azurerm-resource-cdn-endpoint"
 description: |-
-  Create a CDN Endpoint entity.
+  Manages a CDN Endpoint.
+
 ---
 
 # azurerm\_cdn\_endpoint
@@ -20,15 +21,15 @@ resource "azurerm_resource_group" "test" {
 
 resource "azurerm_cdn_profile" "test" {
   name                = "acceptanceTestCdnProfile1"
-  location            = "West US"
+  location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
-  sku                 = "Standard"
+  sku                 = "Standard_Verizon"
 }
 
 resource "azurerm_cdn_endpoint" "test" {
   name                = "acceptanceTestCdnEndpoint1"
   profile_name        = "${azurerm_cdn_profile.test.name}"
-  location            = "West US"
+  location            = "${azurerm_resource_group.test.location}"
   resource_group_name = "${azurerm_resource_group.test.name}"
 
   origin {
@@ -77,9 +78,9 @@ The `origin` block supports:
 
 * `host_name` - (Required) A string that determines the hostname/IP address of the origin server. This string can be a domain name, Storage Account endpoint, Web App endpoint, IPv4 address or IPv6 address.
 
-* `http_port` - (Optional) The HTTP port of the origin. Defaults to null. When null, 80 will be used for HTTP.
+* `http_port` - (Optional) The HTTP port of the origin. Defaults to `80`.
 
-* `https_port` - (Optional) The HTTPS port of the origin. Defaults to null. When null, 443 will be used for HTTPS.
+* `https_port` - (Optional) The HTTPS port of the origin. Defaults to `443`.
 
 ## Attributes Reference