diff -Nru base-files-9.5/debian/changelog base-files-9.5+rpi1/debian/changelog
--- base-files-9.5/debian/changelog	2015-10-28 22:29:15.000000000 +0000
+++ base-files-9.5+rpi1/debian/changelog	2016-01-18 15:58:28.000000000 +0000
@@ -1,3 +1,12 @@
+base-files (9.5+rpi1) stretch-staging; urgency=medium
+
+  [changes brought forward from 8+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 07 Jan 2015 02:03:42 +0000]
+  * Modify default vendor etc for raspbian.
+  * Modify maintainer scripts so default will be set to raspbian even when
+    upgrading
+
+ -- Raspbian forward porter <root@raspbian.org>  Tue, 03 Nov 2015 12:06:24 +0000
+
 base-files (9.5) unstable; urgency=medium
 
   * os-release: Drop trailing slash in SUPPORT_URL variable, as the URL
diff -Nru base-files-9.5/debian/conffiles base-files-9.5+rpi1/debian/conffiles
--- base-files-9.5/debian/conffiles	2014-07-19 15:08:38.000000000 +0000
+++ base-files-9.5+rpi1/debian/conffiles	2016-01-18 15:58:28.000000000 +0000
@@ -1,5 +1,6 @@
 /etc/debian_version
 /etc/dpkg/origins/debian
+/etc/dpkg/origins/raspbian
 /etc/host.conf
 /etc/issue
 /etc/issue.net
diff -Nru base-files-9.5/debian/postinst.in base-files-9.5+rpi1/debian/postinst.in
--- base-files-9.5/debian/postinst.in	2015-08-18 10:03:09.000000000 +0000
+++ base-files-9.5+rpi1/debian/postinst.in	2016-01-18 15:58:28.000000000 +0000
@@ -44,11 +44,11 @@
   fi
 }
 
-if [ ! -e /etc/dpkg/origins/default ]; then
+#if [ ! -e /etc/dpkg/origins/default ]; then
   if [ -e /etc/dpkg/origins/#VENDORFILE# ]; then
     ln -sf #VENDORFILE# /etc/dpkg/origins/default
   fi
-fi
+#fi
 
 if [ "$1" = "configure" ] && [ "$2" = "" ]; then
   install_from_default staff-group-for-usr-local \
diff -Nru base-files-9.5/debian/rules base-files-9.5+rpi1/debian/rules
--- base-files-9.5/debian/rules	2015-05-17 12:40:00.000000000 +0000
+++ base-files-9.5+rpi1/debian/rules	2016-01-18 15:58:28.000000000 +0000
@@ -13,7 +13,7 @@
 
 BUILD_DATE := $(shell dpkg-parsechangelog -S Date)
 
-VENDORFILE = debian
+VENDORFILE = raspbian
 
 VERSION = $(shell cat etc/debian_version)
 
diff -Nru base-files-9.5/etc/issue base-files-9.5+rpi1/etc/issue
--- base-files-9.5/etc/issue	2015-04-30 10:00:00.000000000 +0000
+++ base-files-9.5+rpi1/etc/issue	2016-01-18 15:58:28.000000000 +0000
@@ -1,2 +1,2 @@
-Debian #OSNAME# stretch/sid \n \l
+Raspbian #OSNAME# stretch/sid \n \l
 
diff -Nru base-files-9.5/etc/issue.net base-files-9.5+rpi1/etc/issue.net
--- base-files-9.5/etc/issue.net	2015-04-30 10:00:00.000000000 +0000
+++ base-files-9.5+rpi1/etc/issue.net	2016-01-18 15:58:28.000000000 +0000
@@ -1 +1 @@
-Debian #OSNAME# stretch/sid
+Raspbian #OSNAME# stretch/sid
diff -Nru base-files-9.5/etc/os-release base-files-9.5+rpi1/etc/os-release
--- base-files-9.5/etc/os-release	2015-10-28 16:37:11.000000000 +0000
+++ base-files-9.5+rpi1/etc/os-release	2016-01-18 15:59:06.000000000 +0000
@@ -1,6 +1,7 @@
-PRETTY_NAME="Debian #OSNAME# stretch/sid"
-NAME="Debian #OSNAME#"
-ID=debian
-HOME_URL="https://www.debian.org/"
-SUPPORT_URL="https://www.debian.org/support"
-BUG_REPORT_URL="https://bugs.debian.org/"
+PRETTY_NAME="Raspbian #OSNAME# stretch/sid"
+NAME="Raspbian #OSNAME#"
+ID=raspbian
+ID_LIKE=debian
+HOME_URL="http://www.raspbian.org/"
+SUPPORT_URL="http://www.raspbian.org/RaspbianForums"
+BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"
diff -Nru base-files-9.5/origins/raspbian base-files-9.5+rpi1/origins/raspbian
--- base-files-9.5/origins/raspbian	1970-01-01 00:00:00.000000000 +0000
+++ base-files-9.5+rpi1/origins/raspbian	2016-01-18 15:58:28.000000000 +0000
@@ -0,0 +1,4 @@
+Vendor: Raspbian
+Vendor-URL: http://www.raspbian.org/
+Bugs: https://bugs.launchpad.net/raspbian/+filebug
+Parent: Debian