diff --git a/beagleboard.org_image.sh b/beagleboard.org_image.sh
index 0a95b2df5d27156003d516369a809c5167147f4f..29d2be39f6283465c1a7032df9a765a7cd07c925 100755
--- a/beagleboard.org_image.sh
+++ b/beagleboard.org_image.sh
@@ -422,7 +422,7 @@ repo_external_arch="armhf"
 repo_external_server="http://debian.beagleboard.org/packages"
 repo_external_dist="wheezy-bbb"
 repo_external_components="main"
-repo_external_key="http://debian.beagleboard.org/packages/beagleboneblack-archive-keyring.asc"
+repo_external_key="debian.beagleboard.org-archive-keyring.asc"
 
 #Package: beaglebone
 #Version: 0.20140306.1
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 4867bbf5343a788388f08019979e2b17c4c5cb1b..9c78393830bf543bf5968dc627d18f670ce3ba9e 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -268,6 +268,12 @@ jessie|sid|trusty)
 	;;
 esac
 
+if [ "x${repo_external}" = "xenable" ] ; then
+	if [ ! "x${repo_external_key}" = "x" ] ; then
+		sudo cp -v ${DIR}/target/keyring/${repo_external_key} ${tempdir}/tmp/${repo_external_key}
+	fi
+fi
+
 if [ -f /tmp/sources.list ] ; then
 	sudo mv /tmp/sources.list ${tempdir}/etc/apt/sources.list
 fi
@@ -383,7 +389,8 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
 
 	install_pkg_updates () {
 		if [ "x${repo_external}" = "xenable" ] ; then
-			wget --no-verbose ${repo_external_key} -O - | apt-key add -
+			apt-key add /tmp/${repo_external_key}
+			rm -f /tmp/${repo_external_key} || true
 		fi
 		if [ "x${chroot_multiarch_armel}" = "xenable" ] ; then
 			echo "Log: (chroot) multiarch enabled added: [armel]"