diff -Nru base-files-7.1wheezy2/debian/changelog base-files-7.1wheezy2+rpi1/debian/changelog
--- base-files-7.1wheezy2/debian/changelog	2013-09-22 22:28:54.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/debian/changelog	2013-10-17 17:39:01.000000000 +0000
@@ -1,3 +1,11 @@
+base-files (7.1wheezy2+rpi1) wheezy-staging; urgency=low
+
+  * 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>  Thu, 17 Oct 2013 17:38:41 +0000
+
 base-files (7.1wheezy2) stable; urgency=low
 
   * Changed /etc/debian_version to 7.2, for Debian 7.2 point release.
diff -Nru base-files-7.1wheezy2/debian/conffiles base-files-7.1wheezy2+rpi1/debian/conffiles
--- base-files-7.1wheezy2/debian/conffiles	2012-05-21 12:09:18.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/debian/conffiles	2013-10-17 17:39:07.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-7.1wheezy2/debian/postinst.in base-files-7.1wheezy2+rpi1/debian/postinst.in
--- base-files-7.1wheezy2/debian/postinst.in	2012-12-12 11:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/debian/postinst.in	2013-10-17 17:39:07.000000000 +0000
@@ -32,11 +32,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 /usr/share/base-files/staff-group-for-usr-local \
diff -Nru base-files-7.1wheezy2/debian/rules base-files-7.1wheezy2+rpi1/debian/rules
--- base-files-7.1wheezy2/debian/rules	2012-06-17 12:11:15.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/debian/rules	2013-10-17 17:39:07.000000000 +0000
@@ -11,7 +11,7 @@
   OSNAME=GNU/Hurd
 endif
 
-VENDORFILE = debian
+VENDORFILE = raspbian
 
 VERSION = $(shell cat etc/debian_version)
 
diff -Nru base-files-7.1wheezy2/etc/issue base-files-7.1wheezy2+rpi1/etc/issue
--- base-files-7.1wheezy2/etc/issue	2013-06-02 20:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/etc/issue	2013-10-17 17:39:07.000000000 +0000
@@ -1,2 +1,2 @@
-Debian #OSNAME# 7 \n \l
+Raspbian #OSNAME# 7 \n \l
 
diff -Nru base-files-7.1wheezy2/etc/issue.net base-files-7.1wheezy2+rpi1/etc/issue.net
--- base-files-7.1wheezy2/etc/issue.net	2013-06-02 20:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/etc/issue.net	2013-10-17 17:39:07.000000000 +0000
@@ -1 +1 @@
-Debian #OSNAME# 7
+Raspbian #OSNAME# 7
diff -Nru base-files-7.1wheezy2/etc/issue.net.orig base-files-7.1wheezy2+rpi1/etc/issue.net.orig
--- base-files-7.1wheezy2/etc/issue.net.orig	1970-01-01 00:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/etc/issue.net.orig	2013-10-17 17:39:07.000000000 +0000
@@ -0,0 +1 @@
+Debian #OSNAME# 7
diff -Nru base-files-7.1wheezy2/etc/issue.orig base-files-7.1wheezy2+rpi1/etc/issue.orig
--- base-files-7.1wheezy2/etc/issue.orig	1970-01-01 00:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/etc/issue.orig	2013-10-17 17:39:07.000000000 +0000
@@ -0,0 +1,2 @@
+Debian #OSNAME# 7 \n \l
+
diff -Nru base-files-7.1wheezy2/etc/os-release base-files-7.1wheezy2+rpi1/etc/os-release
--- base-files-7.1wheezy2/etc/os-release	2013-06-02 20:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/etc/os-release	2013-10-17 17:39:07.000000000 +0000
@@ -1,9 +1,10 @@
-PRETTY_NAME="Debian #OSNAME# 7 (wheezy)"
-NAME="Debian #OSNAME#"
+PRETTY_NAME="Raspbian #OSNAME# 7 (wheezy)"
+NAME="Raspbian #OSNAME#"
 VERSION_ID="7"
 VERSION="7 (wheezy)"
-ID=debian
+ID=raspbian
+ID_LIKE=debian
 ANSI_COLOR="1;31"
-HOME_URL="http://www.debian.org/"
-SUPPORT_URL="http://www.debian.org/support/"
-BUG_REPORT_URL="http://bugs.debian.org/"
+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-7.1wheezy2/etc/os-release.orig base-files-7.1wheezy2+rpi1/etc/os-release.orig
--- base-files-7.1wheezy2/etc/os-release.orig	1970-01-01 00:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/etc/os-release.orig	2013-10-17 17:39:07.000000000 +0000
@@ -0,0 +1,9 @@
+PRETTY_NAME="Debian #OSNAME# 7 (wheezy)"
+NAME="Debian #OSNAME#"
+VERSION_ID="7"
+VERSION="7 (wheezy)"
+ID=debian
+ANSI_COLOR="1;31"
+HOME_URL="http://www.debian.org/"
+SUPPORT_URL="http://www.debian.org/support/"
+BUG_REPORT_URL="http://bugs.debian.org/"
diff -Nru base-files-7.1wheezy2/origins/raspbian base-files-7.1wheezy2+rpi1/origins/raspbian
--- base-files-7.1wheezy2/origins/raspbian	1970-01-01 00:00:00.000000000 +0000
+++ base-files-7.1wheezy2+rpi1/origins/raspbian	2013-10-17 17:39:07.000000000 +0000
@@ -0,0 +1,4 @@
+Vendor: Raspbian
+Vendor-URL: http://www.raspbian.org/
+Bugs: https://bugs.launchpad.net/raspbian/+filebug
+Parent: Debian