diff --git a/extra/cbindgen/build b/extra/cbindgen/build
index 7e3850d0..6555b338 100755
--- a/extra/cbindgen/build
+++ b/extra/cbindgen/build
@@ -20,6 +20,10 @@ export CARGO_HOME=$PWD
 (
     cd vendor
 
+    # Download link for this crate 404s. Mirror link saves
+    # the file as 'download' so it must be renamed.
+    mv -f download wasi-0.9.0+wasi-snapshot-preview1.crate
+
     for crate in *.crate; do
         tar xf "$crate"
 
diff --git a/extra/cbindgen/sources b/extra/cbindgen/sources
index 49335045..53e0396c 100644
--- a/extra/cbindgen/sources
+++ b/extra/cbindgen/sources
@@ -48,7 +48,7 @@ https://static.crates.io/crates/unicode-segmentation/unicode-segmentation-1.6.0.
 https://static.crates.io/crates/unicode-width/unicode-width-0.1.8.crate vendor
 https://static.crates.io/crates/unicode-xid/unicode-xid-0.2.1.crate vendor
 https://static.crates.io/crates/vec_map/vec_map-0.8.2.crate vendor
-https://static.crates.io/crates/wasi-0.9.0+wasi-snapshot/wasi-0.9.0+wasi-snapshot-preview1.crate vendor
+https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download vendor
 https://static.crates.io/crates/winapi/winapi-0.3.9.crate vendor
 https://static.crates.io/crates/winapi-i686-pc-windows-gnu/winapi-i686-pc-windows-gnu-0.4.0.crate vendor
 https://static.crates.io/crates/winapi-x86_64-pc-windows-gnu/winapi-x86_64-pc-windows-gnu-0.4.0.crate vendor
diff --git a/extra/eiwd/depends b/extra/eiwd/depends
index 1f97bc3a..e9c22545 100644
--- a/extra/eiwd/depends
+++ b/extra/eiwd/depends
@@ -1 +1,2 @@
+gcc make
 linux-headers make
diff --git a/extra/gnugrep/version b/extra/gnugrep/version
index 8c2b20bb..712a0c0b 100644
--- a/extra/gnugrep/version
+++ b/extra/gnugrep/version
@@ -1 +1 @@
-3.6 1 
+3.6 1