diff --git a/schema/fs.go b/schema/fs.go
index b7c5ad616..92e805a95 100644
--- a/schema/fs.go
+++ b/schema/fs.go
@@ -205,7 +205,7 @@ var _escData = map[string]*_escFile{
 	"/config-schema.json": {
 		local:   "config-schema.json",
 		size:    774,
-		modtime: 1479372487,
+		modtime: 1483690724,
 		compressed: `
 H4sIAAAJbogA/5SRsW4DIQyG93sKRDL2QodOt+YBOnSsOlAwOUc6TI0zRFXevQJyTU6KquvCYP/f/2P7
 u1NKe8iOMQlS1IPSrwninqJYjMBqTzHgQb0lcBjQ2ap6Ktg2uxEmW5BRJA3GHDPFvlV3xAfj2Qbpn19M
@@ -219,7 +219,7 @@ YiIJ+f9eV27hNWIW4vOjMSyzPd/WjQLTfejq2Dniyl26+a1/0AxfJ+R68vcHl7htejl9p9RHd+l+AgAA
 	"/content-descriptor.json": {
 		local:   "content-descriptor.json",
 		size:    836,
-		modtime: 1479372487,
+		modtime: 1483690724,
 		compressed: `
 H4sIAAAJbogA/5SSv+/TMBDF9/wVJ7cjrRkqhqywM8CGGFz7nFzV2OZ8VRVQ/3fkOGlTkL4/lih6ep+7
 92z/aQCUw2yZklAMqgX1NWH4HIMYCshQ/jAIfJlNkeFbQkuerJmID2XENtseB1PwXiS1Wp9yDLuq7iN3
@@ -233,6 +233,7 @@ DLQ9RAMAAA==
 
 	"/defs-config.json": {
 		local:   "defs-config.json",
+eabda42a6120e7130d3b89197d8ddc8266867d4d
 		size:    2236,
 		modtime: 1481704571,
 		compressed: `
@@ -244,13 +245,27 @@ uGDzH1b7dgeWF134qiz7TF2eb5MRXLvixfb+mcrKwWicn9n/2qm/dFdfiL8n2Rtcdc4/mAOUl45kN7Hx
 /z2SrPt9ZNdMJDaec4EWaO0ei1FEl7+tjuuXtrQnC75yoz3TpamBo17O7JQCw48KGYoez1MGQ3dZl/Fv
 5ncYhbg+J/ScwQiMbqql7i2xM9JOY4K+EXQwPfGmkjtadVaOrvaHehWanIPxP89zoOCC1Pt2J+fgB6IS
 jNdz5yFrPg/ZnwAAAP//3oH4m7wIAAA=
+		size:    2483,
+		modtime: 1484547026,
+		compressed: `
+H4sIAAAJbogA/+RWTW/TQBC9+1eMFo6BXhCHXlNuoCBZwAGhaGOPkynenWV2DFgo/x3ZDak/EpOmzamH
+KNqP9+bNm9ld/0kATI4xEwpK7M01mBssyFMzihCsKGVVaQWUYRHQz9mrJY8Cc/YFrSENmFFBmW3xszvC
+PYO5hiYGgMna7fsxgNE6YBOQV7eYaQtt54NwQFHC2NkNYD5FlN5MhyOqkF+b/dJ2do/7gI6lHiJfChYN
+Mscivr6N7F9cdXRfkde3b6b40l82PB3nPFTpxsog5UdRvvsdOGL+kUUfyupsSFtDF3elOczvfx6rhhWx
+tZl1l0jRDWVM1A9geySoSh2YvA5js8dFk9PXXoB+uEmJEzL/I7UvdyB5UoWvyrLP1OX5drhVXP5sc//M
+ZeXGh+TE/M/t+ktn9YXlO/n1DZ11vb23KywvbUl6oPBPbknS/d+xG2HWIj7m3cipKJaUjyy6/G212z9V
+0l5Y9JUb1cyUtkaJZtqzvQuCPyoSzHs89x4M1SVdxn+ebyhq/8l8sOmZoFUc3VRT2RcszmrbjVbxlZLD
+wx1vK93wWWdlp2q5Gn0OnIRm53D88pwCRRe0XraVPAZfMZdovTl2HpLmt03+BgAA//9Mw2saswkAAA== 
 `,
 	},
 
 	"/defs-image.json": {
 		local:   "defs-image.json",
 		size:    2736,
+eabda42a6120e7130d3b89197d8ddc8266867d4d
 		modtime: 1481704392,
+		modtime: 1483690724,
+Modify the error message
 		compressed: `
 H4sIAAAJbogA/7yWz27bOBDG736KgRIgB1tWDosFYgQBFpvLnnLInmq4xYQaWZNKpDqkkzqB372gLMv6
 m8BN0JMhcvjx+w1nSL9OAIKYrBIuHBsdLCC4pYQ1+y8LBYpjtclQwBm4K0j/a7RD1iTwX45rgvuCFCes
@@ -270,7 +285,7 @@ AP//R591MrAKAAA=
 	"/defs.json": {
 		local:   "defs.json",
 		size:    3193,
-		modtime: 1470056192,
+		modtime: 1483690724,
 		compressed: `
 H4sIAAAJbogA/7SWQZPSMBTH73yKTPSIbpumLXBzRNc97MDMjifHQy0PiEIS09Rx3eG7OymlNG0oFPGw
 C03yfv/3/nmheRkghBeQpYpJzQTHE4SnsGScmacM5RkskF4rka/WItdIrwHNJPD3guuEcVDoSULKlixN
@@ -282,7 +297,7 @@ RGtQfK6EBKUZZLUghPDbF3+4s4a6ShjUP1tJzfbS/zmpknUmqc8P03oip9smINgKvL828J1SyfNsef8w
 zVwWJGb66ADTsG1U7ZYy+TgrLPX21l8p6d5oW+cj28A80WuXQj3usP4D/3XewEbyFuCTED/qBHmiS6Sd
 VIdaVYLrMOJErbLLOK6smzSwyu+AGZ/ONHGpZwy5aU8VDjsVH6aPiZSNn5ZTG7AWmbZOS4dk/cQ0LUsP
 N79bwDL2B66kOB15FDnXl7iRiVylF0p3N+QCMs14Ul6e/xknpH1v7kRd0uJl+/V7ZVRdquBnzhQsrDeo
-VfOwZWpT3H45DszfbvA3AAD//0JyEpx5DAAA
+VfOwZWpT3H45DszfbvA3AAD//0JyEpx5DAAAeabda42a6120e7130d3b89197d8ddc8266867d4d
 `,
 	},
 
@@ -301,6 +316,7 @@ ngEAAA==
 
 	"/image-manifest-schema.json": {
 		local:   "image-manifest-schema.json",
+eabda42a6120e7130d3b89197d8ddc8266867d4d
 		size:    1139,
 		modtime: 1481704392,
 		compressed: `
@@ -312,13 +328,24 @@ MfO7Yhk6lz9qRkvmsSid3uhz1bryKDEQjyuOnL18X74BlPF+Ws5HH9i2rqc267dVvz3cv0sXpBbSj02Q
 3vFA42WK24BDmp28I8emVutCu8pU+mSOGOSSXq2bEMxxs9yHiHN6er8WuyCnNc8/TQc4b1wYZhfzDuTt
 fTQTSdSXknevV2NxkKZsOZm60RYHYsqvN8xd9ZqdqoC/nimgfalQ/e1G1euDqCVtd75LVZ53fwIAAP//
 E6WkmXMEAAA=
+		size:    1134,
+		modtime: 1484547074,
+		compressed: `
+H4sIAAAJbogA/6xSsW4UMRDt7ytGTjpya4KotqVKgSiIaBCFWc/uTXQeG49z4nS6f0e219nbHAUCyn3r
+9+a9eXPaACiLMkQKiTyrHtSngPzBczLEGOHBmQnho2EaURJ8DjjQSIMpr+8y/VaGHTqTqbuUQq/1k3je
+VrTzcdI2mjFt377XFbupPLKNIr3WPiAPbaoUWn2tKTvQbnZQuekYMLP99yccZixEHzAmQlE95GAAqkp8
+wSg1XIWvMz/uSGAk3FuQmhAF0g6hDIc2HKoeHKogGAHDQJxwwlhcFPG/S6bXZl/UWtarMY6Y3LNTPbxb
+MPOzYQU61z/KoSXzWJVO/+hz0bryKCkSTwuOXLx8nb8BlAlhP5+PPrDt/EBd0e+afne4f5MvSM2kb6sg
+g+eRpssUtxHHPDt7R07bVq2P3SLT6HtzxCiX9GbdxGiOq+U+JHT56f1S7Iycljx/NB3gvHJhmH0qO5D/
+0Mel2t3rrVgcZVsXnP3caIsjMZXXK+am2SwmVcQfzxTRvrSnfnee6vUttH7W697kFs+bXwEAAP///ALW
+6W4EAAA=
 `,
 	},
 
 	"/manifest-list-schema.json": {
 		local:   "manifest-list-schema.json",
 		size:    1101,
-		modtime: 1479372487,
+		modtime: 1483690724,
 		compressed: `
 H4sIAAAJbogA/6ySMY8TMRCF+/yKkY8OsgZEtS00SCAKTjSIwqxns3OKx8bjizid8t+R7fVml1Ag3ZV5
 8bz3vZ153AEoizJECok8qx7Ul4D83nMyxBjhozMHhM+GaURJ8IkkwdeAA400mDLyKnu8kGFCZ/L8lFLo
diff --git a/schema/image-manifest-schema.json b/schema/image-manifest-schema.json
index 48d3540cb..4d4907b74 100644
--- a/schema/image-manifest-schema.json
+++ b/schema/image-manifest-schema.json
@@ -29,7 +29,7 @@
       }
     },
     "annotations": {
-      "id": "https://opencontainers.org/schema/image/manifest-list/annotations",
+      "id": "https://opencontainers.org/schema/image/manifest/annotations",
       "$ref": "defs-image.json#/definitions/annotations"
     }
   },