diff --git a/crun-1.17.tar.gz b/crun-1.17.tar.gz
deleted file mode 100644
index 2c7598e..0000000
--- a/crun-1.17.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b766609814c0b0a3c0d2d235af1b061bd71da1aa2e8bb181d66e89f1b9a4e874
-size 1773153
diff --git a/crun-1.17.tar.gz.asc b/crun-1.17.tar.gz.asc
deleted file mode 100644
index e55cc35..0000000
--- a/crun-1.17.tar.gz.asc
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCAAdFiEEr2D8o82qberRV+o6Z+OPeouiF3IFAmbe+kIACgkQZ+OPeoui
-F3Kr8Af+Lr1TLt/nDA6Dgjo55pQScbgAa7nq1iM2yZEQpq2WwpXvj6M15pZ3vWAj
-kzeotA3JX3VrggjgLZ5j2GPh37BQfNteehX9yae3AkaltLkANZSaAbekqWCvX4Pk
-PeD9LzPLqOHGBCGi58UjeXl9Ov4bYhrDvIv7+LL3Q5qG2fp2ynfm7IEhSz7wjXns
-Yd6rqbs+bP+RlJUp6fcy5gBZEoCrLiBBh9TH1mPHURkzSsJNCf3Vqm2pQXfQlHBU
-VtWZU0D5XYnhyBHSPmZCdMjy7WAdACYN9euBDP2XhXSvv95bQy/NLC/IMUDJq5FL
-/ihOb/YV2LpSGoUvbBOliIdqtbVftw==
-=jC+F
------END PGP SIGNATURE-----
diff --git a/crun-1.18.tar.gz b/crun-1.18.tar.gz
new file mode 100644
index 0000000..95d7db3
--- /dev/null
+++ b/crun-1.18.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a83b70b350e50ad320376685e975afae535dad64e982e2b7c57a0db45663902a
+size 1777725
diff --git a/crun-1.18.tar.gz.asc b/crun-1.18.tar.gz.asc
new file mode 100644
index 0000000..df8ee8e
--- /dev/null
+++ b/crun-1.18.tar.gz.asc
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCAAdFiEEr2D8o82qberRV+o6Z+OPeouiF3IFAmcXoUIACgkQZ+OPeoui
+F3IG1wf6As2b44CDAgYZA1avwOV5RZYe2koC9xcdZNq9zCr+qcbubHwbr4NB0zc0
+L+QQWpyMmnnQkI/7ZFphK2mL0OB68Rd1YHjZh9S7oIkF/u24/+18ZoBI1hZsz59p
+BDUnRVLJLOyx0Hk13y6UcaKzHJq7nX59pquSSS3VHNKu97J9TgAUwCcWaoaRR8Zb
+7tykfXoEgOajRhU1V3AawDGRh4HZ9wit1GCESWawGx/UYH+VJtMX/ruZmn/QUjzs
+zJ/XFN+jQ7IdBXVnrSk4Nnd+9PBrvqmxY0D8AgW84q2peWnoi+IdZqtQ51fHQVoN
+pKZxNC391NpQ+DMX81O+SL14NUORXQ==
+=nft0
+-----END PGP SIGNATURE-----
diff --git a/crun.changes b/crun.changes
index 2577cba..42426d2 100644
--- a/crun.changes
+++ b/crun.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Mon Oct 28 09:39:05 UTC 2024 - Aleksa Sarai <asarai@suse.com>
+
+- Update to crun v1.18. Upstream changelog is available from
+  <https://github.com/containers/crun/releases/tag/1.18>
+- Remove URL from crun.keyring source declaration. If the Ubuntu keyservers
+  update their server software or some other minor change causes the output of
+  the key to change (such as the maintainer updating their key expiry), we will
+  end up with build failures despite the key still being a totally valid key to
+  do verifications with. This also matches how keyring files are managed for
+  most packages.
+
 -------------------------------------------------------------------
 Wed Sep 11 20:12:48 UTC 2024 - Richard Rahl <rrahl0@opensuse.org>
 
@@ -46,7 +58,7 @@ Thu May 30 12:30:26 UTC 2024 - Dario Faggioli <dfaggioli@suse.com>
   * features: add support for potentiallyUnsafeConfigAnnotations.
   * handlers: add option to load wasi-nn plugin for wasmedge.
   * linux: fix "harden chdir()" security measure. The previous check was not correct.
-  * crun: add option --keep to the run command. When specified the container is not automatically deleted when it exits. 
+  * crun: add option --keep to the run command. When specified the container is not automatically deleted when it exits.
 
 -------------------------------------------------------------------
 Wed Mar  6 10:06:50 UTC 2024 - Dan Čermák <dcermak@suse.com>
@@ -88,7 +100,7 @@ Sat Jan 27 16:21:04 UTC 2024 - Andrea Manzini <andrea.manzini@suse.com>
 - update to 1.14:
   * build: drop dependency on libgcrypt. Use blake3 to compute the cache key.
   * cpuset: don't clobber parent cgroup value when writing the cpuset value.
-  * linux: force umask(0). It ensures that the mknodat syscall is not affected by the umask of the calling process, 
+  * linux: force umask(0). It ensures that the mknodat syscall is not affected by the umask of the calling process,
     allowing file permissions to be set as specified in the OCI configuration.
   * ebpf: do not require MEMLOCK for eBPF programs. This requirement was relaxed in Linux 5.11.
 
diff --git a/crun.keyring b/crun.keyring
index 9876368..ab53398 100644
--- a/crun.keyring
+++ b/crun.keyring
@@ -1,6 +1,6 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: Hockeypuck 2.2
 Comment: Hostname: 
+Version: Hockeypuck 2.2
 
 xsFNBFJtp1EBEAC/8IKgtgDH/BWRWUkM7pDWWZJJgaE2wMhCKXbXMbtyJHBco/TG
 7Ow2bD35H0QAmhh6gGVYu9hwrzK3EiP9SmTMXjJmhm6b2iFlhV9bbU5pjb/q3pT6
diff --git a/crun.spec b/crun.spec
index 72153e5..3bd4286 100644
--- a/crun.spec
+++ b/crun.spec
@@ -27,14 +27,14 @@
 %endif
 
 Name:           crun
-Version:        1.17
+Version:        1.18
 Release:        0
 Summary:        OCI runtime written in C
 License:        GPL-2.0-or-later
 URL:            https://github.com/containers/crun
 Source0:        %{URL}/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        %{URL}/releases/download/%{version}/%{name}-%{version}.tar.gz.asc
-Source2:        https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xac404c1c0bf735c63ff4d562263d6df2e163e1ea#/%{name}.keyring
+Source2:        %{name}.keyring
 # We always run autogen.sh
 BuildRequires:  autoconf
 BuildRequires:  automake