diff --git a/builtin/providers/azurerm/resource_arm_dns_zone.go b/builtin/providers/azurerm/resource_arm_dns_zone.go
index 2571e761c241..8b552983a2d6 100644
--- a/builtin/providers/azurerm/resource_arm_dns_zone.go
+++ b/builtin/providers/azurerm/resource_arm_dns_zone.go
@@ -39,6 +39,13 @@ func resourceArmDnsZone() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+
+			"name_servers": &schema.Schema{
+				Type:     schema.TypeSet,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+				Set:      schema.HashString,
+			},
 		},
 	}
 }
@@ -104,6 +111,14 @@ func resourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error {
 	d.Set("number_of_record_sets", resp.NumberOfRecordSets)
 	d.Set("max_number_of_record_sets", resp.MaxNumberOfRecordSets)
 
+	nameServers := make([]string, 0, len(resp.NameServers))
+	for _, ns := range resp.NameServers {
+		nameServers = append(nameServers, *ns)
+	}
+	if err := d.Set("name_servers", nameServers); err != nil {
+		return err
+	}
+
 	return nil
 }
 
diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go b/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go
index b880bfb9c9a1..959bcc85a78c 100644
--- a/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go
+++ b/vendor/github.com/jen20/riviera/dns/get_dns_cname_recordset.go
@@ -3,12 +3,12 @@ package dns
 import "github.com/jen20/riviera/azure"
 
 type GetCNAMERecordSetResponse struct {
-	ID          string             `mapstructure:"id"`
-	Name        string             `mapstructure:"name"`
-	Location    string             `mapstructure:"location"`
-	Tags        map[string]*string `mapstructure:"tags"`
-	TTL         *int               `mapstructure:"TTL"`
-	CNAMERecord CNAMERecord        `mapstructure:"CNAMERecord"`
+	ID           string             `mapstructure:"id"`
+	Name         string             `mapstructure:"name"`
+	Location     string             `mapstructure:"location"`
+	Tags         map[string]*string `mapstructure:"tags"`
+	TTL          *int               `mapstructure:"TTL"`
+	CNAMERecord  CNAMERecord        `mapstructure:"CNAMERecord"`
 }
 
 type GetCNAMERecordSet struct {
diff --git a/vendor/github.com/jen20/riviera/dns/get_dns_zone.go b/vendor/github.com/jen20/riviera/dns/get_dns_zone.go
index 6be00cbb59ad..a588f6587dd1 100644
--- a/vendor/github.com/jen20/riviera/dns/get_dns_zone.go
+++ b/vendor/github.com/jen20/riviera/dns/get_dns_zone.go
@@ -9,6 +9,7 @@ type GetDNSZoneResponse struct {
 	Tags                  *map[string]*string `mapstructure:"tags"`
 	NumberOfRecordSets    *string             `mapstructure:"numberOfRecordSets"`
 	MaxNumberOfRecordSets *string             `mapstructure:"maxNumberOfRecordSets"`
+	NameServers           []*string           `mapstructure:"nameServers"`
 }
 
 type GetDNSZone struct {
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 231a96c076f5..d9635eb2a03b 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -951,32 +951,32 @@
 		{
 			"checksumSHA1": "oPpOfZn11Ef6DWOoETxSW9Venzs=",
 			"path": "github.com/jen20/riviera/azure",
-			"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f",
-			"revisionTime": "2016-06-10T12:18:12Z"
+			"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
+			"revisionTime": "2016-06-30T14:11:29Z"
 		},
 		{
-			"checksumSHA1": "A2Ycn6MySifUKTHOnsG9oLwjitE=",
+			"checksumSHA1": "ncdT+1PFEF5ly0niXuQc9/pKzT0=",
 			"path": "github.com/jen20/riviera/dns",
-			"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f",
-			"revisionTime": "2016-06-10T12:18:12Z"
+			"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
+			"revisionTime": "2016-06-30T14:11:29Z"
 		},
 		{
 			"checksumSHA1": "zVXx6ha3bt0N4ukRbRHXjSl91S4=",
 			"path": "github.com/jen20/riviera/search",
-			"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f",
-			"revisionTime": "2016-06-10T12:18:12Z"
+			"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
+			"revisionTime": "2016-06-30T14:11:29Z"
 		},
 		{
 			"checksumSHA1": "KfquDaeBPGchw92QnojlJFsJKgk=",
 			"path": "github.com/jen20/riviera/sql",
-			"revision": "2f01b8f5b09bbc20a591b1dc4b48af0665106b3f",
-			"revisionTime": "2016-06-10T12:18:12Z"
+			"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
+			"revisionTime": "2016-06-30T14:11:29Z"
 		},
 		{
 			"checksumSHA1": "nKUCquNpJ9ifHgkXoT4K3Xar6R8=",
 			"path": "github.com/jen20/riviera/storage",
-			"revision": "64de55fa8cdd0c52f7d59494c1b03c1b583c52b4",
-			"revisionTime": "2016-02-18T23:50:40Z"
+			"revision": "1159d86fc8144abafeb29ee7c5a3e2e85af336ba",
+			"revisionTime": "2016-06-30T14:11:29Z"
 		},
 		{
 			"comment": "0.2.2-2-gc01cf91",