diff -Nru base-files-9.4ubuntu2/debian/changelog base-files-9.4ubuntu3/debian/changelog
--- base-files-9.4ubuntu2/debian/changelog	2015-10-23 13:28:10.000000000 +0200
+++ base-files-9.4ubuntu3/debian/changelog	2015-11-27 15:01:28.000000000 +0100
@@ -1,3 +1,11 @@
+base-files (9.4ubuntu3) xenial; urgency=medium
+
+  * etc/os-release:
+    - add UBUNTU_CODENAME=xenial (LP: #1520154)
+      (having distro specific fields is ok according to the spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 27 Nov 2015 14:59:41 +0100
+
 base-files (9.4ubuntu2) xenial; urgency=medium
 
   * Re-add a newline to /etc/issue.
diff -Nru base-files-9.4ubuntu2/etc/os-release base-files-9.4ubuntu3/etc/os-release
--- base-files-9.4ubuntu2/etc/os-release	2015-10-22 19:13:24.000000000 +0200
+++ base-files-9.4ubuntu3/etc/os-release	2015-11-27 15:00:51.000000000 +0100
@@ -7,3 +7,4 @@
 HOME_URL="http://www.ubuntu.com/"
 SUPPORT_URL="http://help.ubuntu.com/"
 BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"
+UBUNTU_CODENAME=xenial