diff --git a/cmake-3.20.3-SHA-256.txt b/cmake-3.20.3-SHA-256.txt
deleted file mode 100644
index 96b7d8a..0000000
--- a/cmake-3.20.3-SHA-256.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-d48dbc17b515455521b6e6b4cddcf6c8868228e9152e3f378f4586688af7df43  cmake-3.20.3-files-v1.json
-6ba073dd3fac9b73665ab6696a494728e0924b840d11fa2f55e911bb960acadf  cmake-3.20.3-linux-aarch64.sh
-77620f99e9d5f39cf4a49294c6a68c89a978ecef144894618974b9958efe3c2a  cmake-3.20.3-linux-aarch64.tar.gz
-b2eb62957bda8128b6776079a6d79fda616fa6388b45ee536d48daea5cdf1934  cmake-3.20.3-linux-x86_64.sh
-97bf730372f9900b2dfb9206fccbcf92f5c7f3b502148b832e77451aa0f9e0e6  cmake-3.20.3-linux-x86_64.tar.gz
-101050dcee3a19a7db4dc46ef3b222b5dc5329391baa0645ff6ad2fcb559d938  cmake-3.20.3-macos-universal.dmg
-5f72dba3aa5f3800fb29ab6115ae0b31f10bdb2aad66204e14c98f6ac7e6b6ed  cmake-3.20.3-macos-universal.tar.gz
-8794ed068de57d78070a8f1ac91b314a716c9e60a1f28cb6cd2018d0f6513a3d  cmake-3.20.3-macos10.10-universal.dmg
-7868ef5110adf3110dc82a87a73e6a2503aebae1a15d12cc416114ef8062a1da  cmake-3.20.3-macos10.10-universal.tar.gz
-583a6a5c896251f25f367fd27fc54c470e01d11e82b4f19b28bf93b549ac3ead  cmake-3.20.3-windows-i386.msi
-b690206f58368afd69244e8dc029b0b3dacae31bb6d4f6ab713b0e18a686aa7d  cmake-3.20.3-windows-i386.zip
-edf7d8d26d653053e71b4c3ffe8cc410c52ef536ab194dfa3ec116a11620d9c7  cmake-3.20.3-windows-x86_64.msi
-e276cf7fbb3e3e88bc666e183bc3ddaceb143a4c83fb357b1dbb1a26fd6e4ea2  cmake-3.20.3-windows-x86_64.zip
-4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8  cmake-3.20.3.tar.gz
-c936d3b6de092ba0cf6ccecaf2bc70df6060c129ed4f73311b86673e20bc3d68  cmake-3.20.3.zip
diff --git a/cmake-3.20.3-SHA-256.txt.asc b/cmake-3.20.3-SHA-256.txt.asc
deleted file mode 100644
index 6d3dc8b..0000000
--- a/cmake-3.20.3-SHA-256.txt.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmCv6a8ACgkQLSzvEDSS
-FoSHaw//fH6K13IytneTETU6HVBUYtAOaE4he1s/2Bv6DplWp6OhtMqZgR/TVv3n
-XwXd0JudmeCVIuoClOss4hPa9W0gELGjZG3/5jlkLcA8a3NDDpg774ZwBqjDQCIB
-3Kc/rQ3V86Oa/R1igFJux/yedfC3wiCYf5fZ24a/kDWK+jbtH8nMo0o6Gijo1U7C
-X32AsjZ6ldp/cIMlThJCKfJ3VQWJ8gFA/4D7ZEA5PsdNYWfLM1TRts+o6Oyd0WyB
-HxH30PnilZe/nbm+Vf1UVz66RCT+YXSAEe7h+EvG/lXAOplqBTTdymuRr7cmZnH+
-l1w9kl38nBgPm+gSIAISHovR0wzUzRMzlu2HRVY3nJWMYQQ0zMGHtTfr3B1EksEo
-2V8UPiVgOcKlH/QLhFG6GyKFB0B9MLagLOnuGjalpQnZZmbVj8eE1q98mqpludQT
-Z6PPxHAnP0iS38V95IpUshPSZL1+8+AHZn3Vblsk+lROOpIXi916eicRAInIApCS
-ym7q3OaBvpNRvQ1EMMeok0Ac46GAClz3k15j7n0DkHjzc+/TpjlQQ99cOKx9E7RV
-1LjnGKGUtXGE9XFbOK6dOF61RbxHQ3dT7ly5HQcXiSmA8un87sUKa4JXVZoBOx1S
-Nji9LZz0qc9zIJwrEzJiMj66LeSRWthfFbSNQc1LNjnKPTWErmk=
-=agwb
------END PGP SIGNATURE-----
diff --git a/cmake-3.20.3.tar.gz b/cmake-3.20.3.tar.gz
deleted file mode 100644
index c0fb032..0000000
--- a/cmake-3.20.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4d008ac3461e271fcfac26a05936f77fc7ab64402156fb371d41284851a651b8
-size 9440009
diff --git a/cmake-3.20.4-SHA-256.txt b/cmake-3.20.4-SHA-256.txt
new file mode 100644
index 0000000..895cf99
--- /dev/null
+++ b/cmake-3.20.4-SHA-256.txt
@@ -0,0 +1,15 @@
+9aa2607c3d96b63fb0899ad05c18fb3ff3651ce4564459f200f654ad06a57df5  cmake-3.20.4-files-v1.json
+d0c0d0b474ce9226fb97082b5b35bab473b1b36f8ef457c068faa06081210f33  cmake-3.20.4-linux-aarch64.sh
+d66869db7c0da56f2e32271e264756382f2f17e2421ac67f1372953cf8ec51a2  cmake-3.20.4-linux-aarch64.tar.gz
+497ba08b694afca57e8c808e0b8db0be1e26398c455e399609dfb1905f3ba49c  cmake-3.20.4-linux-x86_64.sh
+067feed25b76b3adf5863f5a5f7e2b8cafb2dcd6feeaac39a713372ef2c3584c  cmake-3.20.4-linux-x86_64.tar.gz
+4db0d5f0f7bbbe19302067f21e5a2be8235b44b1b465c117006fb154432f6873  cmake-3.20.4-macos-universal.dmg
+df90016635e3183834143c6d94607f0804fe9762f7cc6032f6a4afd7c19cd43b  cmake-3.20.4-macos-universal.tar.gz
+2a7242cebe6d2f570c40f88b0ee4c29d9a9c81cc7eb7ca76d851752fbfa3f62f  cmake-3.20.4-macos10.10-universal.dmg
+368bf3bedac38a931a334b9b515d83879c82dacd55eed2adb1ef2725b9038607  cmake-3.20.4-macos10.10-universal.tar.gz
+72d05ce962dc97eda9e1fbd40b4c8c60f64da2d870136ca760c7826e59f7f926  cmake-3.20.4-windows-i386.msi
+e571c0cebb237da800198ef89d1c874d15f04dfe13dc44d85c2a56e90a4a5209  cmake-3.20.4-windows-i386.zip
+2a6fa766187812bb2a4db1746ad119a8f215fb1b57debe8a5ef66b9757e0b8db  cmake-3.20.4-windows-x86_64.msi
+965d2f001c3ca807d288f2b6b15c42b25579a0e73ef12c2a72c95f4c69123638  cmake-3.20.4-windows-x86_64.zip
+87a4060298f2c6bb09d479de1400bc78195a5b55a65622a7dceeb3d1090a1b16  cmake-3.20.4.tar.gz
+943a80de2520c5c053bcca7c93d4613e1f74e9faa95d3cb0429ce785e9d0b382  cmake-3.20.4.zip
diff --git a/cmake-3.20.4-SHA-256.txt.asc b/cmake-3.20.4-SHA-256.txt.asc
new file mode 100644
index 0000000..63f63be
--- /dev/null
+++ b/cmake-3.20.4-SHA-256.txt.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEExsJlMku+vcNQtRPQLSzvEDSSFoQFAmDHfU8ACgkQLSzvEDSS
+FoSY5A//WT0qLwgfRYYvOqDiF3SyR4kmmHOCTobE518UOXArNDyUp12VRSHxn5OJ
+0cmOt/pSWAUCJwP8IIoML+N+sax4g0mTOeKL6kJIui9xDLObQh8Itil1ExSAoANl
+P4NdujAz8RnMb/wUCS5fI2iAp7d5m12CfJtbp2krs0QCpnSskBUG+kQM96A17ubh
+hhKXPVb8B95us2aN/ITT8N2l1RxpnZcNwN3wHdjuFMSgReCakLKOtSEvds60njmk
+F3Hk8TBQrazXPDS6LBeoghup2xm3NqzrKY+ozzLwFAZimGi/+9UYv/OYgStBYVh2
+PgfcG3SDOdcYP/0I3g7hGUTAqRY9S67PP2ZG4I6093TUUwU8W+btdOUL3P3QCQ0H
+qkTdTOj0vFFvTLyQ9OH+nkbPFOzp7f9Czt/tSBlp7DHHRwtcw/Qaav4VT08wMDdf
+bYhSWqWCG85SSZQMMGCmYeIumQ9u7RmGvy8kx3bx0ia1CtMUisx9XLW+JeFUsdku
+fudnR5nlFcci+I7JL8izxxccsIzXdh7iriQ0yghp9xNj7kQ0snLOwUPsp7UFC0Rj
+ukl1e0D82JtZPwJFLmbV+O/x7DXpBEmv1zkktb0aQ6Pu9LrsuDPKPw66nDa8ilxB
+rY1tCoX2W4OMv+oWxm/k0sn44tumhDavNlfvDpSvbt3vqJ09++M=
+=JSGc
+-----END PGP SIGNATURE-----
diff --git a/cmake-3.20.4.tar.gz b/cmake-3.20.4.tar.gz
new file mode 100644
index 0000000..fb5e0c8
--- /dev/null
+++ b/cmake-3.20.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87a4060298f2c6bb09d479de1400bc78195a5b55a65622a7dceeb3d1090a1b16
+size 9440363
diff --git a/cmake.changes b/cmake.changes
index 6ae4a52..be6735e 100644
--- a/cmake.changes
+++ b/cmake.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Jun 15 08:44:30 UTC 2021 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to 3.20.4:
+  * Fix CMAKE_EXPORT_COMPILE_COMMANDS crash with custom compile rule
+  * Fix buildPreset "jobs" field test case
+  * Fix codemodel-v2 link command fragment relative paths
+  * FindBoost: Add check for json component header in Boost 1.75+
+  * cmake_path: fix erroneous example for IS_PREFIX
+  * Clang/MSVC: C++20 final flag, C++23 support
+
 -------------------------------------------------------------------
 Sat May 29 12:08:21 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
 
diff --git a/cmake.spec b/cmake.spec
index dd6c93c..cd89e61 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -37,7 +37,7 @@
 %endif
 %define shortversion 3.20
 Name:           cmake%{?psuffix}
-Version:        3.20.3
+Version:        3.20.4
 Release:        0
 Summary:        Cross-platform make system
 License:        BSD-3-Clause