diff -Nru base-installer-1.156/debian/changelog base-installer-1.156+rpi1/debian/changelog
--- base-installer-1.156/debian/changelog	2015-06-14 05:38:50.000000000 +0000
+++ base-installer-1.156+rpi1/debian/changelog	2015-06-24 18:46:45.000000000 +0000
@@ -1,3 +1,9 @@
+base-installer (1.156+rpi1) stretch-staging; urgency=medium
+  [changes brought forward from 1.148+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 30 Jul 2014 05:27:29 +0000]
+  * Use raspbian-archive-keyring instead of debian-archive-keyring.
+
+ -- Raspbian forward porter <root@raspbian.org>  Wed, 24 Jun 2015 18:44:19 +0000
+
 base-installer (1.156) unstable; urgency=medium
 
   [ Updated translations ]
diff -Nru base-installer-1.156/debian/control base-installer-1.156+rpi1/debian/control
--- base-installer-1.156/debian/control	2013-07-13 06:01:02.000000000 +0000
+++ base-installer-1.156+rpi1/debian/control	2015-06-24 18:46:45.000000000 +0000
@@ -16,7 +16,7 @@
 Package: bootstrap-base
 Package-Type: udeb
 Architecture: any
-Depends: ${shlibs:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb (>= 1.0.7), gpgv-udeb, debian-archive-keyring-udeb, archdetect
+Depends: ${shlibs:Depends}, mounted-partitions, created-fstab, base-installer, debootstrap-udeb (>= 1.0.7), gpgv-udeb, raspbian-archive-keyring-udeb, archdetect
 Provides: kernel-installer, installed-base
 XB-Installer-Menu-Item: 6500
 Description: Install the base system