diff --git a/crun.spec b/crun.spec
index 54943fc..828c30b 100644
--- a/crun.spec
+++ b/crun.spec
@@ -1,17 +1,18 @@
 %global krun_opts %{nil}
 %global wasmedge_opts %{nil}
-
-# krun and wasm[edge,time] support only on aarch64 and x86_64
-%ifarch aarch64 || x86_64
-%global wasm_support 1
+%global yajl_opts %{nil}
 
 %if %{defined copr_username}
 %define copr_build 1
 %endif
 
+# krun and wasm support only on aarch64 and x86_64
+%ifarch aarch64 || x86_64
+
 # Disable wasmedge on rhel 10 until EPEL10 is in place, otherwise it causes
 # build issues on copr
-%if %{defined fedora} || (%{defined %copr_build} && %{defined rhel} && 0%{?rhel} < 10)
+%if %{defined fedora} || (%{defined copr_build} && %{defined rhel} && 0%{?rhel} < 10)
+%global wasm_support 1
 %global wasmedge_support 1
 %global wasmedge_opts --with-wasmedge
 %endif
@@ -24,6 +25,12 @@
 
 %endif
 
+%if %{defined fedora} || (%{defined rhel} && 0%{?rhel} < 10)
+%global system_yajl 1
+%else
+%global yajl_opts --enable-embedded-yajl
+%endif
+
 Summary: OCI runtime written in C
 Name: crun
 %if %{defined copr_build}
@@ -35,8 +42,8 @@ Epoch: 102
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.17
-Release: %autorelease
+Version: 1.18.2
+Release: 1%{?dist}
 URL: https://github.com/containers/%{name}
 Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.zst
 License: GPL-2.0-only
@@ -55,13 +62,18 @@ BuildRequires: libcap-devel
 BuildRequires: libkrun-devel
 %endif
 BuildRequires: systemd-devel
+%if %{defined system_yajl}
+BuildRequires: yajl-devel
+%endif
 BuildRequires: libseccomp-devel
 BuildRequires: python3-libmount
 BuildRequires: libtool
 BuildRequires: protobuf-c-devel
+%ifnarch riscv64
 BuildRequires: criu-devel >= 3.17.1-2
 Recommends: criu >= 3.17.1
 Recommends: criu-libs
+%endif
 %if %{defined wasmedge_support}
 BuildRequires: wasmedge-devel
 %endif
@@ -86,12 +98,10 @@ krun is a symlink to the %{name} binary, with libkrun as an additional dependenc
 %package wasm
 Summary: %{name} with wasm support
 Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-# The hard dep on wasm-library is causing trouble in internal testing farm
-# with RHEL.
+# wasm packages are not present on RHEL yet and are currently a PITA to test
+# Best to only include wasmedge as weak dep on rhel
 %if %{defined fedora}
 Requires: wasm-library
-%else
-Recommends: wasm-library
 %endif
 Recommends: wasmedge
 
@@ -104,17 +114,13 @@ Recommends: wasmedge
 
 %build
 ./autogen.sh
-./configure --disable-silent-rules --enable-embedded-yajl %{krun_opts} %{wasmedge_opts}
+./configure --disable-silent-rules %{krun_opts} %{wasmedge_opts} %{yajl_opts}
 %make_build
 
 %install
 %make_install prefix=%{_prefix}
 rm -rf %{buildroot}%{_prefix}/lib*
 
-%if %{defined wasm_support}
-ln -s %{name} %{buildroot}%{_bindir}/%{name}-wasm
-%endif
-
 %files
 %license COPYING
 %{_bindir}/%{name}
@@ -134,4 +140,6 @@ ln -s %{name} %{buildroot}%{_bindir}/%{name}-wasm
 %endif
 
 %changelog
-%autochangelog
+* Mon Nov 25 2024 Jindrich Novy <jnovy@redhat.com> - 1.18.2-1
+- update to https://github.com/containers/crun/releases/tag/1.18.2
+- Related: RHEL-58992
diff --git a/sources b/sources
index 6f53768..5739bf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (crun-1.17.tar.zst) = 3e46241b10c72fc4139c1b0256d3dcd012ffa4ec3e7db752d0eb0497b95e722b9345b77210197e88c9543a1270612ba768b343d16a151ea8154167292b2f7b1c
+SHA512 (crun-1.18.2.tar.zst) = 78de21ea40a06c719a1f4d4e0aef99b2653c8324b47450598d05cd407cbe6b70105d4990d6cf6f686dcc1259e91e383f7850317f556caee7ce9270797a809de3