diff --git a/compiler-rt/PKGBUILD b/compiler-rt/PKGBUILD
index 0d698ccbe1..77654628cb 100644
--- a/compiler-rt/PKGBUILD
+++ b/compiler-rt/PKGBUILD
@@ -1,14 +1,14 @@
 # POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
+# Maintainer: Evangelos Foutras <foutrelis@archlinux.org>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 
 pkgname=compiler-rt
-pkgver=17.0.6
-pkgrel=2
+pkgver=18.1.8
+pkgrel=1
 pkgdesc="Compiler runtime libraries for clang"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
 url="https://compiler-rt.llvm.org/"
-license=('custom:Apache 2.0 with LLVM Exception')
+license=('Apache-2.0 WITH LLVM-exception')
 depends=('gcc-libs')
 makedepends=('llvm' 'cmake' 'ninja' 'python')
 # Build 32-bit compiler-rt libraries on x86_64 (FS#41911)
@@ -17,12 +17,11 @@ options=('staticlibs')
 _source_base=https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver
 source=($_source_base/compiler-rt-$pkgver.src.tar.xz{,.sig}
         $_source_base/cmake-$pkgver.src.tar.xz{,.sig})
-sha256sums=('11b8d09dcf92a0f91c5c82defb5ad9ff4acf5cf073a80c317204baa922d136b4'
+sha256sums=('e054e99a9c9240720616e927cb52363abbc8b4f1ef0286bad3df79ec8fdf892f'
             'SKIP'
-            '807f069c54dc20cb47b21c1f6acafdd9c649f3ae015609040d6182cab01140f4'
+            '59badef592dd34893cd319d42b323aaa990b452d05c7180ff20f23ab1b41e837'
             'SKIP')
-validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A'  # Tom Stellard <tstellar@redhat.com>
-              'D574BD5D1D0E98895E3BF90044F2485E45D59042') # Tobias Hieta <tobias@hieta.se>
+validpgpkeys=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar@redhat.com>
 
 prepare() {
   mv cmake{-$pkgver.src,}