diff -Nru base-files-9.9+deb9u11/debian/changelog base-files-9.9+rpi1+deb9u11/debian/changelog
--- base-files-9.9+deb9u11/debian/changelog	2019-09-08 10:51:39.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/debian/changelog	2019-09-09 23:20:47.000000000 +0000
@@ -1,3 +1,12 @@
+base-files (9.9+rpi1+deb9u11) 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
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Mon, 09 Sep 2019 23:20:47 +0000
+
 base-files (9.9+deb9u11) stretch; urgency=emergency
 
   * Non-maintainer upload.
diff -Nru base-files-9.9+deb9u11/debian/postinst.in base-files-9.9+rpi1+deb9u11/debian/postinst.in
--- base-files-9.9+deb9u11/debian/postinst.in	2019-08-30 11:00:00.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/debian/postinst.in	2019-09-09 23:19:01.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.9+deb9u11/debian/rules base-files-9.9+rpi1+deb9u11/debian/rules
--- base-files-9.9+deb9u11/debian/rules	2019-08-30 11:00:00.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/debian/rules	2019-09-09 23:19:01.000000000 +0000
@@ -8,7 +8,7 @@
   OSNAME=GNU/Hurd
 endif
 
-VENDORFILE = debian
+VENDORFILE = raspbian
 
 %:
 	dh $@
diff -Nru base-files-9.9+deb9u11/etc/issue base-files-9.9+rpi1+deb9u11/etc/issue
--- base-files-9.9+deb9u11/etc/issue	2017-01-15 22:00:00.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/etc/issue	2019-09-09 23:19:01.000000000 +0000
@@ -1,2 +1 @@
-Debian #OSNAME# 9 \n \l
-
+Raspbian #OSNAME# 9 \n \l
diff -Nru base-files-9.9+deb9u11/etc/issue.net base-files-9.9+rpi1+deb9u11/etc/issue.net
--- base-files-9.9+deb9u11/etc/issue.net	2017-01-15 22:00:00.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/etc/issue.net	2019-09-09 23:19:01.000000000 +0000
@@ -1 +1 @@
-Debian #OSNAME# 9
+Raspbian #OSNAME# 9
diff -Nru base-files-9.9+deb9u11/etc/os-release base-files-9.9+rpi1+deb9u11/etc/os-release
--- base-files-9.9+deb9u11/etc/os-release	2019-08-30 08:52:09.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/etc/os-release	2019-09-09 23:19:56.000000000 +0000
@@ -1,9 +1,10 @@
-PRETTY_NAME="Debian #OSNAME# 9 (stretch)"
-NAME="Debian #OSNAME#"
+PRETTY_NAME="Raspbian #OSNAME# 9 (stretch)"
+NAME="Raspbian #OSNAME#"
 VERSION_ID="9"
 VERSION="9 (stretch)"
 VERSION_CODENAME=stretch
-ID=debian
-HOME_URL="https://www.debian.org/"
-SUPPORT_URL="https://www.debian.org/support"
-BUG_REPORT_URL="https://bugs.debian.org/"
+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.9+deb9u11/origins/raspbian base-files-9.9+rpi1+deb9u11/origins/raspbian
--- base-files-9.9+deb9u11/origins/raspbian	1970-01-01 00:00:00.000000000 +0000
+++ base-files-9.9+rpi1+deb9u11/origins/raspbian	2019-09-09 23:18:35.000000000 +0000
@@ -0,0 +1,4 @@
+Vendor: Raspbian
+Vendor-URL: http://www.raspbian.org/
+Bugs: https://bugs.launchpad.net/raspbian/+filebug
+Parent: Debian