diff --git a/marshal.go b/marshal.go
index 7a634be..247e6b1 100644
--- a/marshal.go
+++ b/marshal.go
@@ -375,6 +375,9 @@ func populateAmazonMetadata(dst *AmazonMetadataType, src map[string]string) {
 	bindValue(&dst.HostName, src, "hostname")
 	bindValue(&dst.AmiID, src, "ami-id")
 	bindValue(&dst.InstanceType, src, "instance-type")
+	bindValue(&dst.AccountId, src, "accountId")
+	bindValue(&dst.VpcId, src, "vpc-id")
+	bindValue(&dst.Mac, src, "mac")
 }
 
 func adaptDataCenterInfo(dst *DataCenterInfo, src *preliminaryDataCenterInfo) {
diff --git a/struct.go b/struct.go
index 28b1a5a..4460ad8 100644
--- a/struct.go
+++ b/struct.go
@@ -125,6 +125,9 @@ type AmazonMetadataType struct {
 	HostName         string `xml:"hostname" json:"hostname"`
 	AmiID            string `xml:"ami-id" json:"ami-id"`
 	InstanceType     string `xml:"instance-type" json:"instance-type"`
+	AccountId        string `xml:"accountId" json:"accountId"`
+	Mac              string `xml:"mac" json:"mac"`
+	VpcId            string `xml:"vpc-id" json:"vpc-id"`
 }
 
 // DataCenterInfo indicates which type of data center hosts this instance