diff --git a/templates/etc/pbuilder/debian.erb b/templates/etc/pbuilder/debian.erb
index 832e2da362796e00b65f441e66cf490427228caf..da98bc9bdd88047bf17df2a05b2e78a5e4685320 100644
--- a/templates/etc/pbuilder/debian.erb
+++ b/templates/etc/pbuilder/debian.erb
@@ -14,7 +14,7 @@
   # repositories. Currently, we want to include them if, and only if,
   # @include_stanford_keyring is true. So we simply set
   # include_stanford_repos equal to @include_stanford_keyring. Why have a
-  # separate variable that is exactlye the same as another variable?
+  # separate variable that is exactly the same as another variable?
   # Because we may want to de-couple the two variables in the future,
   # that's why.
   include_stanford_repos = @include_stanford_keyring
diff --git a/templates/etc/pbuilder/sid.erb b/templates/etc/pbuilder/sid.erb
index 72c9aa265a9edf3788068fbe975f278fd5ba507d..96606625863c3ecda200d76f3a2dd1cb18b21bd1 100644
--- a/templates/etc/pbuilder/sid.erb
+++ b/templates/etc/pbuilder/sid.erb
@@ -1,9 +1,9 @@
 # /etc/pbuilder/sid -- Debian override configuration file for pbuilder.
 
 MIRRORSITE=http://debian.stanford.edu/debian
+<%- if (@include_stanford_keyring) then -%>
 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 -%>
 # Avoid the chicken-and-egg issue by not including stanford-keyring.