diff --git a/latomic.patch b/8.2/sid/cli/latomic.patch
similarity index 100%
rename from latomic.patch
rename to 8.2/sid/cli/latomic.patch
diff --git a/8.2/sid/fpm/latomic.patch b/8.2/sid/fpm/latomic.patch
new file mode 100644
index 00000000..c1f4886b
--- /dev/null
+++ b/8.2/sid/fpm/latomic.patch
@@ -0,0 +1,21 @@
+diff --git a/configure.ac b/configure.ac
+index fcb6297238..0a475ed80f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -373,6 +373,16 @@ if test "$ac_cv_func_dlopen" = "yes"; then
+ fi
+ AC_CHECK_LIB(m, sin)
+ 
++case $host_alias in
++  riscv64*)
++    AC_CHECK_LIB(atomic, __atomic_exchange_1, [
++      PHP_ADD_LIBRARY(atomic)
++    ], [
++      AC_MSG_ERROR([Problem with enabling atomic. Please check config.log for details.])
++    ])
++    ;;
++esac
++
+ dnl Check for inet_aton in -lc, -lbind and -lresolv.
+ PHP_CHECK_FUNC(inet_aton, resolv, bind)
+