diff --git a/programming/profiler/valgrind/actions.py b/programming/profiler/valgrind/actions.py
index 4d11d8f026..70b73cc5a6 100644
--- a/programming/profiler/valgrind/actions.py
+++ b/programming/profiler/valgrind/actions.py
@@ -10,14 +10,18 @@ from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
 
 def setup():
+    autotools.autoreconf("-ifv")
     shelltools.export("CFLAGS", get.CFLAGS().replace("-fstack-protector",""))
     shelltools.export("CPPFLAGS", get.CXXFLAGS().replace("-fstack-protector",""))
-    autotools.configure("--without-mpicc")
+    autotools.configure("--without-mpicc --libexecdir=/usr/lib")
 
 def build():
     autotools.make()
 
+def check():
+    autotools.make("check")
+
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
-    pisitools.dodoc("AUTHORS", "FAQ.txt", "NEWS", "README*")
\ No newline at end of file
+    pisitools.dodoc("AUTHORS", "FAQ.txt", "NEWS", "README*")
diff --git a/programming/profiler/valgrind/files/valgrind-3.7.0-respect-flags.patch b/programming/profiler/valgrind/files/valgrind-3.7.0-respect-flags.patch
new file mode 100644
index 0000000000..b5fc44dd32
--- /dev/null
+++ b/programming/profiler/valgrind/files/valgrind-3.7.0-respect-flags.patch
@@ -0,0 +1,13 @@
+diff -Naur valgrind-3.7.0.orig//mpi/Makefile.am valgrind-3.7.0/mpi/Makefile.am
+--- valgrind-3.7.0.orig/mpi/Makefile.am	2011-10-26 17:24:23.000000000 -0400
++++ valgrind-3.7.0/mpi/Makefile.am	2011-11-10 16:03:14.000000000 -0500
+@@ -7,9 +7,6 @@
+ CC = $(MPI_CC)
+ DEFS =
+ DEFAULT_INCLUDES =
+-CPPFLAGS =
+-CFLAGS =
+-LDFLAGS =
+ 
+ EXTRA_DIST = \
+ 	mpiwrap_type_test.c
diff --git a/programming/profiler/valgrind/pspec.xml b/programming/profiler/valgrind/pspec.xml
index 57e71c3a53..093439faf1 100644
--- a/programming/profiler/valgrind/pspec.xml
+++ b/programming/profiler/valgrind/pspec.xml
@@ -12,14 +12,14 @@
         <IsA>app:console</IsA>
         <Summary>Memory access debugger for X86 and PPC Linux platforms</Summary>
         <Description>Valgrind is an award-winning suite of tools for debugging and profiling Linux programs. With the tools that come with Valgrind, you can automatically detect many memory management and threading bugs, avoiding hours of frustrating bug-hunting, making your programs more stable. You can also perform detailed profiling, to speed up and reduce memory use of your programs.</Description>
-        <Archive sha1sum="192bfe53802abb7f23edbb8aad61158a60c34f8a" type="tarbz2">ftp://sourceware.org/pub/valgrind/valgrind-3.16.1.tar.bz2</Archive>
+        <Archive sha1sum="0a694a8d0c2152978bf64b67ad0b3dd972bbeb54" type="tarbz2">ftp://sourceware.org/pub/valgrind/valgrind-3.18.1.tar.bz2</Archive>
         <BuildDependencies>
             <Dependency>glibc-devel</Dependency>
             <Dependency>boost-devel</Dependency>
             <Dependency>gdb-devel</Dependency>
         </BuildDependencies>
         <Patches>
-<!--             <Patch level="0">fix_rlimit.patch</Patch> -->
+             <Patch level="1">valgrind-3.7.0-respect-flags.patch</Patch>
         </Patches>
     </Source>
 
@@ -31,15 +31,33 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
-             <Path fileType="executable">/usr/libexec</Path>
-            <Path fileType="header">/usr/include/valgrind</Path>
+            <Path fileType="executable">/usr/libexec</Path>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc/valgrind</Path>
             <Path fileType="man">/usr/share/man</Path>
         </Files>
     </Package>
 
+    <Package>
+        <Name>valgrind-devel</Name>
+        <Summary>Development files for valgrind</Summary>
+        <RuntimeDependencies>
+            <Dependency release="current">valgrind</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="header">/usr/include</Path>
+            <Path fileType="library">/usr/lib/pkgconfig</Path>
+        </Files>
+    </Package>
+
     <History>
+        <Update release="10">
+            <Date>2021-10-19</Date>
+            <Version>3.18.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="9">
             <Date>2021-09-15</Date>
             <Version>3.16.1</Version>