diff --git a/M/MPICH/build_tarballs.jl b/M/MPICH/build_tarballs.jl
index 2f997a90fac..c998bdc0358 100644
--- a/M/MPICH/build_tarballs.jl
+++ b/M/MPICH/build_tarballs.jl
@@ -1,14 +1,15 @@
 using BinaryBuilder, Pkg
+using BinaryBuilderBase: get_addable_spec
 using Base.BinaryPlatforms
 const YGGDRASIL_DIR = "../.."
 include(joinpath(YGGDRASIL_DIR, "platforms", "mpi.jl"))
 
 name = "MPICH"
-version = v"4.2.3"
+version = v"4.3.0"
 
 sources = [
-    ArchiveSource("https://www.mpich.org/static/downloads/$(version)/mpich-$(version).tar.gz",
-                  "7a019180c51d1738ad9c5d8d452314de65e828ee240bcb2d1f80de9a65be88a8"),
+    ArchiveSource("https://www.mpich.org/static/downloads/$(version)rc3/mpich-$(version)rc3.tar.gz",
+                  "f2e28c33b5049f5b1440fca82b4cbccb1196be68ead68fc527661e0d67767cda"),
     DirectorySource("bundled"),
 ]
 
@@ -127,7 +128,10 @@ products = [
 
 dependencies = [
     Dependency(PackageSpec(name="CompilerSupportLibraries_jll", uuid="e66e0078-7015-5450-92f7-15fbd957f2ae")),
-    Dependency("Hwloc_jll"; compat="2.11.1"), # We need 2.11.1+1 for aarch64-unknown-freebsd
+    # Dependency("Hwloc_jll"; compat="2.11.2"),
+    # Until we have a new version of hwloc built for riscv64 we need to use the
+    # `get_addable_spec` hack.  From v2.11.3 on we should be able to remove it here.
+    Dependency(get_addable_spec("Hwloc_jll", v"2.11.2+2"); compat="2.11.2"),
     Dependency(PackageSpec(name="MPIPreferences", uuid="3da0fdf6-3ccc-4f1b-acd9-58baa6c99267");
                compat="0.1", top_level=true),
 ]