diff --git a/templates/etc/pbuilder/debian.erb b/templates/etc/pbuilder/debian.erb
index f8711fbb4fef8ef35bd3ad388e85a688e6e705c8..c9b7a4a41d3f0ae3883b9aebb6012f44f9bbcff9 100644
--- a/templates/etc/pbuilder/debian.erb
+++ b/templates/etc/pbuilder/debian.erb
@@ -5,13 +5,16 @@ MIRRORSITE=http://debian.stanford.edu/debian
   if (@include_backports) then
 -%>
 OTHERMIRROR="deb http://debian.stanford.edu/debian <%= @distribution %>-backports main contrib non-free"
+OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-stanford <%= @distribution %>-backports main contrib non-free"
+OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-stanford <%= @distribution %> main contrib non-free"
+OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-local <%= @distribution %> main contrib non-free"
 <%- else -%>
 # Backports distribution either no longer available or not yet
 # available so omitting
 # OTHERMIRROR="deb http://debian.stanford.edu/debian <%= @distribution %>-backports main contrib non-free"
+OTHERMIRROR="deb http://debian.stanford.edu/debian-stanford <%= @distribution %> main contrib non-free"
+OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-local <%= @distribution %> main contrib non-free"
 <%- end -%>
-OTHERMIRROR="$OTHERMIRROR | deb http://debian.stanford.edu/debian-stanford <%= @distribution %> main contrib non-free"
-OTHERMIRROR="$OTHERMIRROR | deb http://debian.stanford.edu/debian-local <%= @distribution %> main contrib non-free"
 <%- if (@include_stanford_keyring) then -%>
 EXTRAPACKAGES="aptitude debconf-utils debhelper gnupg stanford-keyring"
 <%- else -%>
diff --git a/templates/etc/pbuilder/sid.erb b/templates/etc/pbuilder/sid.erb
index 32c86fb35d6d13788f442371596368f9300d3e3c..72c9aa265a9edf3788068fbe975f278fd5ba507d 100644
--- a/templates/etc/pbuilder/sid.erb
+++ b/templates/etc/pbuilder/sid.erb
@@ -1,6 +1,8 @@
 # /etc/pbuilder/sid -- Debian override configuration file for pbuilder.
 
 MIRRORSITE=http://debian.stanford.edu/debian
+OTHERMIRROR="deb http://debian.stanford.edu/debian-stanford <%= @distribution %> main contrib non-free"
+OTHERMIRROR="$OTHERMIRROR |deb http://debian.stanford.edu/debian-local <%= @distribution %> main contrib non-free"
 <%- if (@include_stanford_keyring) then -%>
 EXTRAPACKAGES="aptitude debconf-utils debhelper gnupg stanford-keyring"
 <%- else -%>