diff --git a/database/namespace_mapping.go b/database/namespace_mapping.go
index 95be52be..97ef21d9 100644
--- a/database/namespace_mapping.go
+++ b/database/namespace_mapping.go
@@ -32,12 +32,12 @@ var DebianReleasesMapping = map[string]string{
 
 // UbuntuReleasesMapping translates Ubuntu code names to version numbers
 var UbuntuReleasesMapping = map[string]string{
-	"precise":           "12.04",
-	"quantal":           "12.10",
-	"raring":            "13.04",
-	"trusty":            "14.04",
-	"utopic":            "14.10",
-	"vivid":             "15.04",
-	"vivid/ubuntu-core": "15.04-core",
-	"wily":              "15.10",
+	"precise": "12.04",
+	"quantal": "12.10",
+	"raring":  "13.04",
+	"trusty":  "14.04",
+	"utopic":  "14.10",
+	"vivid":   "15.04",
+	"wily":    "15.10",
+	"xenial":  "16.04",
 }
diff --git a/updater/fetchers/ubuntu/ubuntu.go b/updater/fetchers/ubuntu/ubuntu.go
index 6e72658f..3ea72765 100644
--- a/updater/fetchers/ubuntu/ubuntu.go
+++ b/updater/fetchers/ubuntu/ubuntu.go
@@ -61,6 +61,7 @@ var (
 		"oneiric":  struct{}{},
 		"saucy":    struct{}{},
 
+		"vivid/ubuntu-core":          struct{}{},
 		"vivid/stable-phone-overlay": struct{}{},
 
 		// Syntax error