diff -Nru base-files-10.1/debian/changelog base-files-10.1+rpi1/debian/changelog
--- base-files-10.1/debian/changelog	2018-01-13 23:36:34.000000000 +0000
+++ base-files-10.1+rpi1/debian/changelog	2018-01-24 07:50:05.000000000 +0000
@@ -1,3 +1,15 @@
+base-files (10.1+rpi1) buster-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
+  [changes introduced in 10+rpi1 by Peter Michael Green]
+  * Make some changes using sed in debian/rules rather than directly in source
+    package to avoid merge conflicts.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 24 Jan 2018 07:50:05 +0000
+
 base-files (10.1) unstable; urgency=medium
 
   * Add CC0-1.0 to common-licenses. Closes: #859649, #882628.
diff -Nru base-files-10.1/debian/postinst.in base-files-10.1+rpi1/debian/postinst.in
--- base-files-10.1/debian/postinst.in	2018-01-13 22:00:00.000000000 +0000
+++ base-files-10.1+rpi1/debian/postinst.in	2018-01-24 07:48:38.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 dot.profile   /root/.profile
diff -Nru base-files-10.1/debian/rules base-files-10.1+rpi1/debian/rules
--- base-files-10.1/debian/rules	2018-01-13 22:00:00.000000000 +0000
+++ base-files-10.1+rpi1/debian/rules	2018-01-24 07:49:53.000000000 +0000
@@ -8,13 +8,22 @@
   OSNAME=GNU/Hurd
 endif
 
-VENDORFILE = debian
+VENDORFILE = raspbian
 DESTDIR = debian/base-files
 
 %:
 	dh $@
 
+override_dh_auto_clean:
+	dh_auto_clean
+	sed -i s/Raspbian/Debian/ etc/issue
+	sed -i s/Raspbian/Debian/ etc/issue.net
+	sed -i s/Raspbian/Debian/ etc/os-release
+
 override_dh_auto_build:
+	sed -i s/Debian/Raspbian/ etc/issue
+	sed -i s/Debian/Raspbian/ etc/issue.net
+	sed -i s/Debian/Raspbian/ etc/os-release
 	sh debian/check-md5sum-etc profile
 	sed -e "s&#OSNAME#&$(OSNAME)&g" debian/copyright.in > debian/copyright
 	sed -e "s/#VENDORFILE#/$(VENDORFILE)/g" debian/postinst.in > debian/postinst
diff -Nru base-files-10.1/etc/os-release base-files-10.1+rpi1/etc/os-release
--- base-files-10.1/etc/os-release	2017-06-25 22:18:00.000000000 +0000
+++ base-files-10.1+rpi1/etc/os-release	2018-01-24 07:50:05.000000000 +0000
@@ -1,6 +1,7 @@
 PRETTY_NAME="Debian #OSNAME# buster/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/"
+ID=raspbian
+ID_LIKE=debian
+HOME_URL="http://www.raspbian.org/"
+SUPPORT_URL="http://www.raspbian.org/DebianForums"
+BUG_REPORT_URL="http://www.raspbian.org/DebianBugs"
diff -Nru base-files-10.1/origins/raspbian base-files-10.1+rpi1/origins/raspbian
--- base-files-10.1/origins/raspbian	1970-01-01 00:00:00.000000000 +0000
+++ base-files-10.1+rpi1/origins/raspbian	2017-07-20 12:36:27.000000000 +0000
@@ -0,0 +1,4 @@
+Vendor: Raspbian
+Vendor-URL: http://www.raspbian.org/
+Bugs: https://bugs.launchpad.net/raspbian/+filebug
+Parent: Debian