diff --git a/.gitignore b/.gitignore
index 8622521..823cbe4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /valgrind-3.19.0.tar.bz2
+/valgrind-3.21.0.tar.bz2
diff --git a/sources b/sources
index e93a40c..efed6a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (valgrind-3.19.0.tar.bz2) = f720a89dc4c4989cc5714bff9efe97529f71990bcfad7a92b889ce099c4326d6da07fa4d5fbab2e9125e20f352354f6178471e49e419b613a3c82c2a1c667ab2
+SHA512 (valgrind-3.21.0.tar.bz2) = 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
diff --git a/valgrind-3.16.0-some-Wl-z-now.patch b/valgrind-3.16.0-some-Wl-z-now.patch
index 79c3662..6231733 100644
--- a/valgrind-3.16.0-some-Wl-z-now.patch
+++ b/valgrind-3.16.0-some-Wl-z-now.patch
@@ -35,19 +35,6 @@ index 1b7842b..e211eec 100644
  if HAVE_DLINFO_RTLD_DI_TLS_MODID
  getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDADD = $(LDADD) -ldl
  endif
-diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
-index f572741..1c07e50 100644
---- a/cachegrind/Makefile.am
-+++ b/cachegrind/Makefile.am
-@@ -27,7 +27,7 @@ cg_merge_SOURCES = cg_merge.c
- cg_merge_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
- cg_merge_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
- cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
--cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI)
-+cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI) -Wl,-z,now
- # If there is no secondary platform, and the platforms include x86-darwin,
- # then the primary platform must be x86-darwin.  Hence:
- if ! VGCONF_HAVE_PLATFORM_SEC
 diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
 index 3c73210..fb6b7bb 100644
 --- a/coregrind/Makefile.am
diff --git a/valgrind-3.16.0-some-stack-protector.patch b/valgrind-3.16.0-some-stack-protector.patch
index 324c7d3..b53c465 100644
--- a/valgrind-3.16.0-some-stack-protector.patch
+++ b/valgrind-3.16.0-some-stack-protector.patch
@@ -35,19 +35,6 @@ index 56cc5ef..1b7842b 100644
  getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_CCASFLAGS = $(AM_CCASFLAGS_PRI)
  getoff_@VGCONF_ARCH_PRI@_@VGCONF_OS@_LDFLAGS   = $(AM_CFLAGS_PRI) @LIB_UBSAN@
  if HAVE_DLINFO_RTLD_DI_TLS_MODID
-diff --git a/cachegrind/Makefile.am b/cachegrind/Makefile.am
-index f8447a1..f572741 100644
---- a/cachegrind/Makefile.am
-+++ b/cachegrind/Makefile.am
-@@ -25,7 +25,7 @@ bin_PROGRAMS = cg_merge
- 
- cg_merge_SOURCES = cg_merge.c
- cg_merge_CPPFLAGS  = $(AM_CPPFLAGS_PRI)
--cg_merge_CFLAGS    = $(AM_CFLAGS_PRI)
-+cg_merge_CFLAGS    = $(AM_CFLAGS_PRI) -fstack-protector-strong
- cg_merge_CCASFLAGS = $(AM_CCASFLAGS_PRI)
- cg_merge_LDFLAGS   = $(AM_CFLAGS_PRI)
- # If there is no secondary platform, and the platforms include x86-darwin,
 diff --git a/configure.ac b/configure.ac
 index f8c798b..ccc8f52 100755
 --- a/configure.ac
diff --git a/valgrind-3.21.0-no-memcpy-replace-check.patch b/valgrind-3.21.0-no-memcpy-replace-check.patch
new file mode 100644
index 0000000..cdb0c0a
--- /dev/null
+++ b/valgrind-3.21.0-no-memcpy-replace-check.patch
@@ -0,0 +1,13 @@
+diff --git a/shared/vg_replace_strmem.c b/shared/vg_replace_strmem.c
+index b32f13f76..aa7f88ca2 100644
+--- a/shared/vg_replace_strmem.c
++++ b/shared/vg_replace_strmem.c
+@@ -1128,7 +1128,7 @@ static inline void my_exit ( int x )
+    MEMMOVE_OR_MEMCPY(20181, soname, fnname, 0)
+ 
+ #define MEMCPY(soname, fnname) \
+-   MEMMOVE_OR_MEMCPY(20180, soname, fnname, 1)
++   MEMMOVE_OR_MEMCPY(20180, soname, fnname, 0) /* See KDE bug #402833 */
+ 
+ #if defined(VGO_linux)
+  /* For older memcpy we have to use memmove-like semantics and skip
diff --git a/valgrind.spec b/valgrind.spec
index d9ad7cb..d985f13 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -2,15 +2,13 @@
 
 Summary: Dynamic analysis tools to detect memory or thread bugs and profile
 Name: %{?scl_prefix}valgrind
-Version: 3.19.0
-Release: 1%{?dist}
+Version: 3.21.0
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: https://www.valgrind.org/
 Group: Development/Debuggers
 
-# Only necessary for RHEL, will be ignored on Fedora
-
 # Are we building for a Software Collection?
 %{?scl:%global is_scl 1}
 %{!?scl:%global is_scl 0}
@@ -86,6 +84,10 @@ Patch3: valgrind-3.16.0-some-stack-protector.patch
 # Add some -Wl,z,now.
 Patch4: valgrind-3.16.0-some-Wl-z-now.patch
 
+# Workaround https://bugs.kde.org/show_bug.cgi?id=402833
+# by disabling overlap checking for memcpy
+Patch5: valgrind-3.21.0-no-memcpy-replace-check.patch
+
 BuildRequires: make
 BuildRequires: glibc-devel
 
@@ -226,6 +228,7 @@ Valgrind User Manual for details.
 %patch4 -p1
 %endif
 
+%patch5 -p1
 
 %build
 
@@ -451,6 +454,11 @@ fi
 %endif
 
 %changelog
+* Fri May  5 2023 Mark Wielaard <mjw@redhat.com> - 3.21.0-2
+- Upgrade to upstream 3.21.0
+- Remove upstreamed patches
+- Add valgrind-3.21.0-no-memcpy-replace-check.patch
+
 * Tue Apr 19 2022 Mark Wielaard <mjw@redhat.com> - 3.19.0-1
 - Upgrade to valgrind 3.19.0. Drop old patches.