diff --git a/.gitignore b/.gitignore
index 2c227e7..c1daaca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
 /mpich-4.1.tar.gz
 /mpich-4.1.1.tar.gz
 /mpich-4.1.2.tar.gz
+/mpich-4.2.1.tar.gz
+/mpich-4.2.2.tar.gz
diff --git a/0004-Make-mpich.module-useful.patch b/0004-Make-mpich.module-useful.patch
index ac2a39d..f18ef39 100644
--- a/0004-Make-mpich.module-useful.patch
+++ b/0004-Make-mpich.module-useful.patch
@@ -11,7 +11,7 @@ diff --git a/src/packaging/envmods/mpich.module.in b/src/packaging/envmods/mpich
 index 3d6b4fa623..b8283274ee 100644
 --- a/src/packaging/envmods/mpich.module.in
 +++ b/src/packaging/envmods/mpich.module.in
-@@ -3,12 +3,23 @@
+@@ -3,12 +3,24 @@
  #  MPICH module for use with 'environment-modules' package:
  # 
  
diff --git a/mpich.spec b/mpich.spec
index 077fc35..173a671 100644
--- a/mpich.spec
+++ b/mpich.spec
@@ -1,6 +1,6 @@
 Summary:        A high-performance implementation of MPI
 Name:           mpich
-Version:        4.1.2
+Version:        4.2.2
 Release:        %autorelease
 License:        mpich2
 URL:            https://www.mpich.org/
@@ -37,7 +37,7 @@ BuildRequires:  libfabric-devel
 BuildRequires:  libnl3-devel
 BuildRequires:  libuuid-devel
 BuildRequires:  numactl-devel
-%ifarch aarch64 ppc64le x86_64
+%ifarch aarch64 ppc64le x86_64 riscv64
 BuildRequires:  ucx-devel
 %endif
 %if ! 0%{?rhel}
@@ -151,7 +151,7 @@ CONFIGURE_OPTS=(
         --htmldir=%{_datadir}/%{name}/doc
         --with-hwloc
         --with-libfabric
-%ifarch aarch64 ppc64le x86_64
+%ifarch aarch64 ppc64le x86_64 riscv64
         --with-ucx
 %endif
 %if ! 0%{?rhel}
@@ -217,6 +217,9 @@ mkdir -p %{buildroot}%{_libdir}/%{name}/include
 
 find %{buildroot} -type f -name "*.la" -delete
 
+rm %{buildroot}%{_libdir}/%{name}/bin/parkill
+
+
 %check
 make check VERBOSE=1 \
 %ifarch ppc64le
@@ -244,7 +247,6 @@ make check VERBOSE=1 \
 %{_libdir}/%{name}/bin/mpiexec*
 %{_libdir}/%{name}/bin/mpirun
 %{_libdir}/%{name}/bin/mpivars
-%{_libdir}/%{name}/bin/parkill
 %dir %{_mandir}/%{name}-%{_arch}
 %doc %{_mandir}/%{name}-%{_arch}/man1/
 %{_datadir}/modulefiles/mpi/
diff --git a/sources b/sources
index 9eceb11..09a5e12 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mpich-4.1.2.tar.gz) = d1056374ef9ecb6d7816637b6709497e5bc63c3b0af8dfef461aa71a59f9f805b07d80a735eb1511748e78a9260ed967b0597e64a935850fcba1dfef7bf43775
+SHA512 (mpich-4.2.2.tar.gz) = 706b1f008a4da3bc44b9c8191e20031983eed7d82aadeac8cf4b2c7ffbe5c5ec88c047f7a826e3a0a7e076799e03cceec908853eec89f651de50301af619e757