diff --git a/env/crosscompile/linux-armhf-stretch/Dockerfile b/env/crosscompile/linux-armhf-jessie/Dockerfile
similarity index 79%
rename from env/crosscompile/linux-armhf-stretch/Dockerfile
rename to env/crosscompile/linux-armhf-jessie/Dockerfile
index 5cd6f91..6ee3cf2 100644
--- a/env/crosscompile/linux-armhf-stretch/Dockerfile
+++ b/env/crosscompile/linux-armhf-jessie/Dockerfile
@@ -5,16 +5,20 @@
 # Linux builder VM running Debian stretch (i.e. Debian testing)
 # Docker tag gobuilders/linux-armhf-stretch
 
-FROM debian:stretch
+FROM debian:jessie
 MAINTAINER golang-dev <golang-dev@googlegroups.com>
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# curl: for getting and unpacking Go 1.4 source
+# Add the Debian cross toolchains repository and key
+COPY emdebian-toolchain-archive.key /tmp/
+RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list \
+	&& apt-key add /tmp/emdebian-toolchain-archive.key
+
 # git-core: for interacting with the Go source & subrepos
 # gcc, libc-dev: for building Go's bootstrap 'dist' prog
-# gcc-armhf-linux-gnu, libc6-dev-armhf-cross: for armhf builds
-# linux-libc-dev(armhf): for asm/errno.h
+# gcc-armhf-linux-gnu: for armhf builds
+# libc-dev(armhf): for asm/errno.h
 # procps, lsof, psmisc: misc tools
 RUN dpkg --add-architecture armhf \
 	&& apt-get update && apt-get install -y \
@@ -25,8 +29,7 @@
 	gcc \
 	libc6-dev \
 	gcc-arm-linux-gnueabihf \
-	libc6-dev-armhf-cross \
-	linux-libc-dev:armhf \
+	libc-dev:armhf \
 	procps \
 	lsof \
 	psmisc \
diff --git a/env/crosscompile/linux-armhf-stretch/Makefile b/env/crosscompile/linux-armhf-jessie/Makefile
similarity index 100%
rename from env/crosscompile/linux-armhf-stretch/Makefile
rename to env/crosscompile/linux-armhf-jessie/Makefile
diff --git a/env/crosscompile/linux-armhf-stretch/README b/env/crosscompile/linux-armhf-jessie/README
similarity index 100%
rename from env/crosscompile/linux-armhf-stretch/README
rename to env/crosscompile/linux-armhf-jessie/README
diff --git a/env/crosscompile/linux-armhf-jessie/emdebian-toolchain-archive.key b/env/crosscompile/linux-armhf-jessie/emdebian-toolchain-archive.key
new file mode 100644
index 0000000..a4d3112
--- /dev/null
+++ b/env/crosscompile/linux-armhf-jessie/emdebian-toolchain-archive.key
@@ -0,0 +1,41 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.12 (GNU/Linux)
+
+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
+V2JyGQ==
+=q84g
+-----END PGP PUBLIC KEY BLOCK-----