diff --git a/.gitignore b/.gitignore
index cac3f58..76f95dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,7 @@
 /third_party-0.8.1.tar.gz
 /jpegxl-0.8.2.tar.gz
 /third_party-0.8.2.tar.gz
+/jpegxl-0.8.3.tar.gz
+/third_party-0.8.3.tar.gz
+/jpegxl-0.8.4.tar.gz
+/third_party-0.8.4.tar.gz
diff --git a/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch b/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
new file mode 100644
index 0000000..2910f95
--- /dev/null
+++ b/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
@@ -0,0 +1,31 @@
+From 22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc Mon Sep 17 00:00:00 2001
+From: Eastdong <31920925+IEAST@users.noreply.github.com>
+Date: Thu, 23 Feb 2023 06:08:36 +0800
+Subject: [PATCH] Add missing <atomic> content to fix gcc compilation for RISCV
+ architecture. (#2211)
+
+* Add missing <atomic> content to fix gcc compilation for RISCV architecture.
+
+* add name to AUTHORS
+
+* lint fix
+
+[RWMJ: Removed AUTHORS change since it causes a patch conflict]
+
+Co-authored-by: Moritz Firsching <firsching@google.com>
+---
+ lib/jxl/enc_xyb.cc | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/lib/jxl/enc_xyb.cc b/lib/jxl/enc_xyb.cc
+index 1ef78877a71..2ee0abf821a 100644
+--- a/lib/jxl/enc_xyb.cc
++++ b/lib/jxl/enc_xyb.cc
+@@ -6,6 +6,7 @@
+ #include "lib/jxl/enc_xyb.h"
+ 
+ #include <algorithm>
++#include <atomic>
+ #include <cstdlib>
+ 
+ #undef HWY_TARGET_INCLUDE
diff --git a/jpegxl.spec b/jpegxl.spec
index 2617bf7..30e6e00 100644
--- a/jpegxl.spec
+++ b/jpegxl.spec
@@ -20,7 +20,7 @@ decoder).}
 
 Name:           jpegxl
 Epoch:          1
-Version:        0.8.2
+Version:        0.8.4
 Release:        %autorelease %{?new_soname:-p -e 0~sonamebump}
 Summary:        JPEG XL image format reference implementation
 
@@ -36,6 +36,10 @@ Source0:        %vcs/archive/v%{version}/%{name}-%{version}.tar.gz
 # set VERSION and run ./update_third_party.sh to get Source1
 Source1:        third_party-%{version}.tar.gz
 
+# Add missing <atomic> header for RISC-V.
+# Upstream in jpegxl >= 0.9.0
+Patch1:         https://github.com/libjxl/libjxl/commit/22d12d74e7bc56b09cfb1973aa89ec8d714fa3fc.patch
+
 BuildRequires:  asciidoc
 BuildRequires:  cmake
 BuildRequires:  doxygen
diff --git a/sources b/sources
index 91cd511..9ba7b55 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (jpegxl-0.8.2.tar.gz) = 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
-SHA512 (third_party-0.8.2.tar.gz) = 74f536c19d38b413bbca0988d8b36aae73110af3b19b78932309fa1892f99f0cc4984cbc4d96dde0716ee993c62f14464a639f8f0a4907c0e6f5ad37b1228816
+SHA512 (jpegxl-0.8.4.tar.gz) = 68e0ffe692f4c5aa33e3f78cea4631b00f42304bc8b9e5accb5e9ff3c19525dca0b02936bf17e787da5a009fd06ba66101d287124f0a93f4b683bc5d7b32b59e
+SHA512 (third_party-0.8.4.tar.gz) = b7cf17551cc75a16dddc4988aad1ba1a14f1e6ba24984e26d1c61f3bd848baab4f4d9cfa26ac78a2baf617767eba6f7aae6b6b6cbc5c0d1cb831a1b628fbcf43
diff --git a/update_third_party.sh b/update_third_party.sh
index 23411ab..14499b2 100755
--- a/update_third_party.sh
+++ b/update_third_party.sh
@@ -1,15 +1,18 @@
-VERSION=0.8.2
+VERSION=0.8.4
 
-if [ ! -d libjxl ]; then
 git clone https://github.com/libjxl/libjxl
-fi
 cd libjxl/
 git checkout .
 git checkout v${VERSION}
-git submodule init ; git submodule update
-git pull
-rm -r third_party/brotli/ third_party/googletest/
-rm -r third_party/HEVCSoftware/ third_party/highway/
-rm -r third_party/lcms/ third_party/libpng/
-rm -r third_party/skcms/profiles/ third_party/zlib
-tar -zcvf ../third_party-${VERSION}.tar.gz third_party/
+./deps.sh
+rm -r third_party/brotli/
+rm -r third_party/googletest/
+rm -r third_party/HEVCSoftware/
+rm -r third_party/highway/
+rm -r third_party/lcms/
+rm -r third_party/libpng/
+rm -r third_party/skcms/profiles/
+rm -r third_party/zlib
+tar -zcf ../third_party-${VERSION}.tar.gz third_party/
+cd ..
+rm -rf libjxl/