diff --git a/Cargo.lock b/Cargo.lock
index 7c4f4fb106..f9fa288a18 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2655,7 +2655,7 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "witx 0.8.3",
+ "witx",
 ]
 
 [[package]]
@@ -2667,7 +2667,7 @@ dependencies = [
  "wiggle-generate",
  "wiggle-runtime",
  "wiggle-test",
- "witx 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "witx",
 ]
 
 [[package]]
@@ -2680,7 +2680,7 @@ dependencies = [
  "quote",
  "syn",
  "wiggle-runtime",
- "witx 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "witx",
 ]
 
 [[package]]
@@ -2740,7 +2740,7 @@ dependencies = [
 
 [[package]]
 name = "witx"
-version = "0.8.3"
+version = "0.8.4"
 dependencies = [
  "anyhow",
  "diff",
@@ -2751,20 +2751,6 @@ dependencies = [
  "wast",
 ]
 
-[[package]]
-name = "witx"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f30f6e46362ed8a64e6b4ff8b7a63006462933a8100c19df39caa333e35ed95"
-dependencies = [
- "anyhow",
- "log",
- "pretty_env_logger",
- "structopt",
- "thiserror",
- "wast",
-]
-
 [[package]]
 name = "yanix"
 version = "0.12.0"
diff --git a/crates/wasi-common/wig/Cargo.toml b/crates/wasi-common/wig/Cargo.toml
index a46335ba24..de7ff4d7de 100644
--- a/crates/wasi-common/wig/Cargo.toml
+++ b/crates/wasi-common/wig/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 quote = "1.0.2"
 proc-macro2 = "1.0.6"
 heck = "0.3.1"
-witx = { path = "WASI/tools/witx", version = "0.8.0" }
+witx = { path = "WASI/tools/witx", version = "0.8.4" }
 
 [badges]
 maintenance = { status = "actively-developed" }
diff --git a/crates/wasi-common/wig/WASI b/crates/wasi-common/wig/WASI
index d5b0c23ed2..068b282abf 160000
--- a/crates/wasi-common/wig/WASI
+++ b/crates/wasi-common/wig/WASI
@@ -1 +1 @@
-Subproject commit d5b0c23ed2730262d4eaac2b2721aad07c6f65b4
+Subproject commit 068b282abfe3510973fb1917892c1f6665f9b462
diff --git a/crates/wiggle/Cargo.toml b/crates/wiggle/Cargo.toml
index e06f92639e..6337d4f0aa 100644
--- a/crates/wiggle/Cargo.toml
+++ b/crates/wiggle/Cargo.toml
@@ -16,7 +16,7 @@ proc-macro = true
 
 [dependencies]
 wiggle-generate = { path = "crates/generate", version = "0.1.0" }
-witx = "0.8.3"
+witx = { path = "../wasi-common/wig/WASI/tools/witx", version = "0.8.4" }
 syn = { version = "1.0", features = ["full"] }
 
 [dev-dependencies]
diff --git a/crates/wiggle/crates/generate/Cargo.toml b/crates/wiggle/crates/generate/Cargo.toml
index 437e908ca2..63e8b2d23b 100644
--- a/crates/wiggle/crates/generate/Cargo.toml
+++ b/crates/wiggle/crates/generate/Cargo.toml
@@ -15,7 +15,7 @@ include = ["src/**/*", "LICENSE"]
 
 [dependencies]
 wiggle-runtime = { path = "../runtime", version = "0.1.0" }
-witx = "0.8.3"
+witx = { version = "0.8.4", path = "../../../wasi-common/wig/WASI/tools/witx" }
 quote = "1.0"
 proc-macro2 = "1.0"
 heck = "0.3"