diff -Nru base-files-10.3/debian/changelog base-files-10.3+rpi1/debian/changelog
--- base-files-10.3/debian/changelog	2019-05-13 20:25:32.000000000 +0000
+++ base-files-10.3+rpi1/debian/changelog	2019-06-06 15:42:15.000000000 +0000
@@ -1,3 +1,21 @@
+base-files (10.3+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.
+  [changes introduced in 10.3+rpi1 by Peter Michael Green]
+  * Make further changes in debian/rules rather than directly to files in
+    package to further avoid merge conflicts.
+  * Make changes in debian/rules in the "install" step to avoid the need for
+    code to revert them.
+  * Add build-dependency on moreutils to support new code in debian/rules.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Thu, 06 Jun 2019 15:42:15 +0000
+
 base-files (10.3) unstable; urgency=medium
 
   * Add Breaks: debian-security-support (<< 2019.04.25). Closes: #928172.
diff -Nru base-files-10.3/debian/control base-files-10.3+rpi1/debian/control
--- base-files-10.3/debian/control	2019-05-13 19:00:00.000000000 +0000
+++ base-files-10.3+rpi1/debian/control	2019-06-06 15:42:15.000000000 +0000
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: Santiago Vila <sanvila@debian.org>
 Standards-Version: 4.1.3
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), moreutils
 
 Package: base-files
 Provides: base
diff -Nru base-files-10.3/debian/postinst.in base-files-10.3+rpi1/debian/postinst.in
--- base-files-10.3/debian/postinst.in	2019-05-13 19:00:00.000000000 +0000
+++ base-files-10.3+rpi1/debian/postinst.in	2019-06-06 15:42:15.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.3/debian/rules base-files-10.3+rpi1/debian/rules
--- base-files-10.3/debian/rules	2019-05-13 19:00:00.000000000 +0000
+++ base-files-10.3+rpi1/debian/rules	2019-06-06 15:42:15.000000000 +0000
@@ -8,7 +8,7 @@
   OSNAME=GNU/Hurd
 endif
 
-VENDORFILE = debian
+VENDORFILE = raspbian
 DESTDIR = debian/base-files
 
 %:
@@ -33,6 +33,15 @@
 	sed -e "s&#OSNAME#&$(OSNAME)&g" etc/issue      > $(DESTDIR)/etc/issue
 	sed -e "s&#OSNAME#&$(OSNAME)&g" etc/issue.net  > $(DESTDIR)/etc/issue.net
 	sed -e "s&#OSNAME#&$(OSNAME)&g" etc/os-release > $(DESTDIR)/etc/os-release
+	sed -i s/Debian/Raspbian/ $(DESTDIR)/etc/issue
+	sed -i s/Debian/Raspbian/ $(DESTDIR)/etc/issue.net
+	sed -i s/Debian/Raspbian/ $(DESTDIR)/etc/os-release
+	egrep -v '^(ID|HOME_URL|SUPPORT_URL|BUG_REPORT_URL)' $(DESTDIR)/etc/os-release | sponge $(DESTDIR)/etc/os-release
+	echo 'ID=raspbian' >> $(DESTDIR)/etc/os-release
+	echo 'ID_LIKE=debian' >> $(DESTDIR)/etc/os-release
+	echo 'HOME_URL="http://www.raspbian.org/"' >> $(DESTDIR)/etc/os-release
+	echo 'SUPPORT_URL="http://www.raspbian.org/RaspbianForums"' >> $(DESTDIR)/etc/os-release
+	echo 'BUG_REPORT_URL="http://www.raspbian.org/RaspbianBugs"' >> $(DESTDIR)/etc/os-release
 	mv $(DESTDIR)/etc/os-release $(DESTDIR)/usr/lib/os-release
 	ln -s ../usr/lib/os-release $(DESTDIR)/etc/os-release
 
diff -Nru base-files-10.3/origins/raspbian base-files-10.3+rpi1/origins/raspbian
--- base-files-10.3/origins/raspbian	1970-01-01 00:00:00.000000000 +0000
+++ base-files-10.3+rpi1/origins/raspbian	2019-06-06 15:42:15.000000000 +0000
@@ -0,0 +1,4 @@
+Vendor: Raspbian
+Vendor-URL: http://www.raspbian.org/
+Bugs: https://bugs.launchpad.net/raspbian/+filebug
+Parent: Debian