diff --git a/.gitignore b/.gitignore
index 440b591..e1b21c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/rpm-ostree-2022.2.tar.xz
+SOURCES/rpm-ostree-2022.2.8.gd50a74bd.tar.xz
diff --git a/.rpm-ostree.metadata b/.rpm-ostree.metadata
index e683e54..3793e0b 100644
--- a/.rpm-ostree.metadata
+++ b/.rpm-ostree.metadata
@@ -1 +1 @@
-1bcee7eba384617fb49922310275f708a97a2fcf SOURCES/rpm-ostree-2022.2.tar.xz
+d66e3e26382ff20a43059615e32f46fab1a5afc3 SOURCES/rpm-ostree-2022.2.8.gd50a74bd.tar.xz
diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec
index 4923bf9..79e18f2 100644
--- a/SPECS/rpm-ostree.spec
+++ b/SPECS/rpm-ostree.spec
@@ -3,7 +3,7 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2022.2
+Version: 2022.2.8.gd50a74bd
 Release: 2%{?dist}
 License: LGPLv2+
 URL: https://github.com/coreos/rpm-ostree
@@ -24,6 +24,15 @@ BuildRequires: rust
 
 # Enable ASAN + UBSAN
 %bcond_with sanitizers
+# Embedded unit tests
+%bcond_with bin_unit_tests
+
+# This is copied from the libdnf spec
+%if 0%{?rhel} && ! 0%{?centos}
+%bcond_without rhsm
+%else
+%bcond_with rhsm
+%endif
 
 # RHEL8 doesn't ship zchunk today.  See also the comments
 # in configure.ac around this as libdnf/librepo need to be in
@@ -94,6 +103,14 @@ BuildRequires:  pkgconfig(smartcols)
 BuildRequires:  pkgconfig(zck) >= 0.9.11
 %endif
 BuildRequires:  gpgme-devel
+%if 0%{?rhel} <= 8
+# In current Fedora, this is a dependency of gpgme-devel, but
+# not in RHEL8.  Missing this package breaks -znow.
+BuildRequires:  libassuan-devel
+%endif
+%if %{with rhsm}
+BuildRequires:  pkgconfig(librhsm) >= 0.0.3
+%endif
 
 # Runtime libdnf deps
 Requires:       libmodulemd%{?_isa} >= %{libmodulemd_version}
@@ -142,7 +159,8 @@ env NOCONFIGURE=1 ./autogen.sh
 %if 0%{?build_rustflags:1}
 export RUSTFLAGS="%{build_rustflags}"
 %endif
-%configure --disable-silent-rules --enable-gtk-doc %{?sqlite_rpmdb_default} %{?with_sanitizers:--enable-sanitizers}
+%configure --disable-silent-rules --enable-gtk-doc %{?rpmdb_default} %{?with_sanitizers:--enable-sanitizers}  %{?with_bin_unit_tests:--enable-bin-unit-tests} \
+  %{?with_rhsm:--enable-featuresrs=rhsm}
 
 %make_build
 
@@ -208,6 +226,12 @@ $PYTHON autofiles.py > files.devel \
 %files devel -f files.devel
 
 %changelog
+* Wed Jun 15 2022 Colin Walters <walters@verbum.org> - 2022.2.8.gd50a74bd-2
+- Update to latest rhel8 branch
+  https://github.com/coreos/rpm-ostree/pull/3749
+  https://github.com/coreos/rpm-ostree/pull/3751
+  Resolves: rhbz#2095528
+
 * Mon Feb 07 2022 Colin Walters <walters@verbum.org> - 2022.2-2
 - Rebase to 2022.1