diff -Nru base-files-6.5ubuntu8/debian/changelog base-files-6.5ubuntu9/debian/changelog
--- base-files-6.5ubuntu8/debian/changelog	2012-07-03 17:43:13.000000000 +0000
+++ base-files-6.5ubuntu9/debian/changelog	2012-09-10 13:38:37.000000000 +0000
@@ -1,3 +1,9 @@
+base-files (6.5ubuntu9) quantal; urgency=low
+
+  * Install /etc/os-release. LP: #947236.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 10 Sep 2012 15:38:03 +0200
+
 base-files (6.5ubuntu8) quantal; urgency=low
 
   * Call date -s $(date -R) on upgrade, to resync any clocks that might
diff -Nru base-files-6.5ubuntu8/debian/rules base-files-6.5ubuntu9/debian/rules
--- base-files-6.5ubuntu8/debian/rules	2012-07-03 17:07:23.000000000 +0000
+++ base-files-6.5ubuntu9/debian/rules	2012-09-10 13:36:47.000000000 +0000
@@ -63,6 +63,9 @@
 		> debian/tmp/etc/issue
 	sed -e "s&#OSNAME#&$(OSNAME)&g" etc/issue.net \
 		> debian/tmp/etc/issue.net
+	sed -e "s&#OSNAME#&$(OSNAME)&g" etc/os-release \
+		> debian/tmp/etc/os-release
+
 	gzip -9 $(docdir)/changelog
 	cd debian/tmp && \
 		md5sum `find usr -type f` > DEBIAN/md5sums
diff -Nru base-files-6.5ubuntu8/etc/os-release base-files-6.5ubuntu9/etc/os-release
--- base-files-6.5ubuntu8/etc/os-release	1970-01-01 00:00:00.000000000 +0000
+++ base-files-6.5ubuntu9/etc/os-release	2012-09-10 13:34:00.000000000 +0000
@@ -0,0 +1,10 @@
+NAME="Ubuntu"
+VERSION="development branch, Quantal Quetzal"
+# which will become ...
+#VERSION="12.10, Quantal Quetzal"
+ID=ubuntu
+ID_LIKE=debian
+PRETTY_NAME="Ubuntu quantal (development branch)"
+# which will become ...
+PRETTY_NAME="Ubuntu quantal (12.10)"
+#VERSION_ID="12.10"