diff --git a/appveyor.yml b/appveyor.yml
index 7947415bea34c..3654ca8c99d91 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -29,11 +29,11 @@ init:
   - git config --global core.autocrlf input
 
 cache:
-# Cache any downloads from sourceforge because it's really unreliable
+# Cache large downloads to avoid network unreliability
   - i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z
   - x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z
-  - llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z
-  - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z
+  - llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z
+  - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z
 
 build_script:
 # If there's a newer build queued for the same PR, cancel this one
diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh
index 3871442a4cb92..1f742f6f9ad81 100755
--- a/contrib/windows/msys_build.sh
+++ b/contrib/windows/msys_build.sh
@@ -122,7 +122,7 @@ if [ -z "$USEMSVC" ]; then
   fi
   export AR=${CROSS_COMPILE}ar
 
-  f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r04.7z
+  f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r09.7z
 else
   echo "override USEMSVC = 1" >> Make.user
   echo "override ARCH = $ARCH" >> Make.user
@@ -142,8 +142,8 @@ checksum_download \
     "$f" "https://bintray.com/artifact/download/tkelman/generic/$f"
 echo "Extracting $f"
 $SEVENZIP x -y $f >> get-deps.log
-echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/tools/llvm-config.exe' >> Make.user
-echo 'override LLVM_SIZE := $(JULIAHOME)/usr/tools/llvm-size.exe' >> Make.user
+echo 'override LLVM_CONFIG := $(JULIAHOME)/usr/bin/llvm-config.exe' >> Make.user
+echo 'override LLVM_SIZE := $(JULIAHOME)/usr/bin/llvm-size.exe' >> Make.user
 
 if [ -z "`which make 2>/dev/null`" ]; then
   if [ -n "`uname | grep CYGWIN`" ]; then
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5
deleted file mode 100644
index 17b03f2082646..0000000000000
--- a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/md5
+++ /dev/null
@@ -1 +0,0 @@
-d639c06cdad6b7c55c1dbdb82e3def15
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512
deleted file mode 100644
index de93e76809c83..0000000000000
--- a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r04.7z/sha512
+++ /dev/null
@@ -1 +0,0 @@
-93785655d61d3eec63a1834669153148102171115982bfc01011a1f154192395ee7e787efc52047dc63a2887a11832ae3faccd7cf3fae4b168ffcd160786adee
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/md5
new file mode 100644
index 0000000000000..56b0fe829865a
--- /dev/null
+++ b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/md5
@@ -0,0 +1 @@
+774a1f7cfd555c8e6a786732697efa7e
diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/sha512
new file mode 100644
index 0000000000000..b290c3fc978c1
--- /dev/null
+++ b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r09.7z/sha512
@@ -0,0 +1 @@
+39b2b6ae8d6a7c0e8334011b396a815fc11932a073ab312a607ac08e494baeaca77fb059cc97221924376fa74518b2e3dfafa2608a256e3d433d4f901c2615f0
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5
deleted file mode 100644
index df47ab34abf50..0000000000000
--- a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/md5
+++ /dev/null
@@ -1 +0,0 @@
-f27bdc73c67ce670b30a2494dcf82e58
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512
deleted file mode 100644
index c6faf62f87059..0000000000000
--- a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r04.7z/sha512
+++ /dev/null
@@ -1 +0,0 @@
-a61e0564816427be4c8d5005077354f01b9c4cb1c0abb1c6ccedf90b44654be4350edabe9a0c5fcd52833f1c4caa6aa286713879bec2eae96cb848c5422113c1
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/md5
new file mode 100644
index 0000000000000..5a107aaf611c8
--- /dev/null
+++ b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/md5
@@ -0,0 +1 @@
+283ebe30bcb1f5b58380af1389a51912
diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/sha512
new file mode 100644
index 0000000000000..fd7e68ca241d9
--- /dev/null
+++ b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r09.7z/sha512
@@ -0,0 +1 @@
+9dcb1496661d33c5683940040d5c4fd9382bb320b157b41a9c97e33548e9255756dc19969193841577de79dc06402191928955d42340e6c10ab3a6f496897bdd