diff --git a/.gitignore b/.gitignore
index 63a7509..b8adefb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 SOURCES/modulemd-1.8.16.tar.xz
-SOURCES/modulemd-2.8.2.tar.xz
+SOURCES/modulemd-2.9.4.tar.xz
diff --git a/.libmodulemd.metadata b/.libmodulemd.metadata
index 6867260..c6cb1f8 100644
--- a/.libmodulemd.metadata
+++ b/.libmodulemd.metadata
@@ -1,2 +1,2 @@
 6e55eddb35afc4cd28b6d8cb248f821af5f49dd7 SOURCES/modulemd-1.8.16.tar.xz
-9846728616cff38995764e9b4315889ecb3d4637 SOURCES/modulemd-2.8.2.tar.xz
+ff95d56052aa84a4a537b164d8eca87b5e7d60c7 SOURCES/modulemd-2.9.4.tar.xz
diff --git a/SPECS/libmodulemd.spec b/SPECS/libmodulemd.spec
index 9a1196f..020e196 100644
--- a/SPECS/libmodulemd.spec
+++ b/SPECS/libmodulemd.spec
@@ -1,8 +1,8 @@
-%global baserelease 1
+%global baserelease 2
 %global v2_epoch 0
 %global v2_major 2
-%global v2_minor 8
-%global v2_patch 2
+%global v2_minor 9
+%global v2_patch 4
 %global v2_release %{baserelease}
 %global libmodulemd_v2_version %{v2_major}.%{v2_minor}.%{v2_patch}
 %global libmodulemd_v1_version 1.8.16
@@ -34,9 +34,7 @@ BuildRequires:  rpm-devel
 BuildRequires:  file-devel
 BuildRequires:  python3-devel
 BuildRequires:  python3-gobject-base
-%ifarch %{valgrind_arches}
-BuildRequires:  valgrind
-%endif
+BuildRequires:  help2man
 
 # Patches
 
@@ -97,6 +95,7 @@ Development files for libmodulemd 1.x
 %package -n python3-libmodulemd1
 Summary: Python 3 bindings for %{name}1
 Version: %{libmodulemd_v1_version}
+Release: %{libmodulemd_v1_release}
 Requires: libmodulemd1 = %{libmodulemd_v1_version}-%{release}
 Requires: python3-gobject-base
 
@@ -122,12 +121,7 @@ popd
 # Build the v2 API
 pushd modulemd-%{libmodulemd_v2_version}
 %define _vpath_builddir api2
-%ifarch aarch64
-# aarch64 builders have I/O issues that often causes the valgrind tests to
-# time out. Skip them from the RPM build
-export MMD_SKIP_VALGRIND=True
-%endif
-%meson -Ddeveloper_build=false -Dskip_formatters=true -Dwith_py3_overrides=true -Dwith_py2_overrides=false
+%meson -Ddeveloper_build=false -Dwith_manpages=enabled
 %meson_build
 popd
 
@@ -135,15 +129,6 @@ popd
 
 export LC_CTYPE=C.utf8
 
-%ifarch %{power64} s390x
-# Valgrind is broken on ppc64[le] with GCC7:
-# https://bugs.kde.org/show_bug.cgi?id=386945
-export MMD_SKIP_VALGRIND=1
-%endif
-%ifnarch %{valgrind_arches}
-export MMD_SKIP_VALGRIND=1
-%endif
-
 pushd modulemd-%{libmodulemd_v1_version}
 %define _vpath_builddir api1
 %{__meson} test -C %{_vpath_builddir} %{?_smp_mesonflags} --print-errorlogs -t 10
@@ -175,6 +160,7 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
 %license modulemd-%{libmodulemd_v2_version}/COPYING
 %doc modulemd-%{libmodulemd_v2_version}/README.md
 %{_bindir}/modulemd-validator
+%{_mandir}/man1/modulemd-validator.1*
 %{_libdir}/%{name}.so.2*
 %dir %{_libdir}/girepository-1.0
 %{_libdir}/girepository-1.0/Modulemd-2.0.typelib
@@ -219,6 +205,11 @@ ln -s libmodulemd.so.%{libmodulemd_v1_version} \
 
 
 %changelog
+* Wed May 20 2020 Stephen Gallagher <sgallagh@redhat.com> - 2.9.4-2
+- Update to 2.9.4
+- Drop valgrind tests from RPM build
+- Resolves: RHBZ#1797749
+
 * Tue Oct 29 2019 Stephen Gallagher <sgallagh@redhat.com> - 2.8.2-1
 - Update to versions 2.8.2 and 1.8.16
 - Resolves: rhbz#1752511