diff --git a/packages.txt b/packages.txt
index de5b488885e..890668e74ec 100644
--- a/packages.txt
+++ b/packages.txt
@@ -884,3 +884,4 @@ pulseaudio
 php-redis
 php-amqp
 pgcat
+valgrind
\ No newline at end of file
diff --git a/valgrind.yaml b/valgrind.yaml
new file mode 100644
index 00000000000..5599abdc62d
--- /dev/null
+++ b/valgrind.yaml
@@ -0,0 +1,82 @@
+package:
+  name: valgrind
+  version: "3.21.0"
+  epoch: 0
+  description: "Tool to help find memory-management problems in programs"
+  copyright:
+    - license: GPL-2.0-or-later
+
+environment:
+  contents:
+    packages:
+      - busybox
+      - ca-certificates-bundle
+      - build-base
+      - automake
+      - autoconf
+      - sed
+      - perl
+      - linux-headers
+      - python3
+
+pipeline:
+  - uses: fetch
+    with:
+      expected-sha512: 3e86cda2f2d6cd30807fac7933ba2c46a97a2b4a868db989e6b0cceeadf029af7ee34ba900466a346948289aacb30f4399799bb83b97cc49a4d2d810441e5cfd
+      uri: https://sourceware.org/pub/valgrind/valgrind-${{package.version}}.tar.bz2
+
+  - runs: |
+      export CFLAGS="${CFLAGS/-fno-plt} -fno-stack-protector -no-pie -U_FORTIFY_SOURCE"
+      ./configure \
+        --build=$CBUILD \
+        --host=$CHOST \
+        --prefix=/usr \
+        --sysconfdir=/etc \
+        --mandir=/usr/share/man \
+        --infodir=/usr/share/info \
+        --localstatedir=/var \
+        --without-mpicc
+
+  - uses: autoconf/make
+
+  - uses: autoconf/make-install
+
+  - runs: |
+      make DESTDIR="$${{targets.destdir}}" install
+
+subpackages:
+  - name: valgrind-doc
+    pipeline:
+      - uses: split/manpages
+    description: valgrind manpages
+
+  - name: valgrind-dev
+    pipeline:
+      - uses: split/dev
+    dependencies:
+      runtime:
+        - valgrind
+    description: valgrind dev
+
+  - name: valgrind-scripts
+    dependencies:
+      runtime:
+        - valgrind
+        - python3
+        - perl
+    pipeline:
+      - runs: |
+          mkdir -p ${{targets.subpkgdir}}/usr/bin
+          mv ${{targets.destdir}}/usr/bin/ms_print \
+              ${{targets.destdir}}/usr/bin/cg_merge \
+              ${{targets.destdir}}/usr/bin/cg_annotate \
+              ${{targets.destdir}}/usr/bin/cg_diff \
+              ${{targets.destdir}}/usr/bin/callgrind_control \
+              ${{targets.destdir}}/usr/bin/callgrind_annotate \
+              ${{targets.subpkgdir}}/usr/bin
+    description: valgrind perl+python cachegrind/callgrind script tools
+
+update:
+  enabled: true
+  release-monitor:
+    identifier: 13639