diff --git a/srcpkgs/valgrind/patches/linux-99999.patch b/srcpkgs/valgrind/patches/linux-99999.patch
deleted file mode 100644
index 664e6bb3ac2..00000000000
--- a/srcpkgs/valgrind/patches/linux-99999.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	2015-05-10 21:13:43.957032176 +0200
-+++ configure	2015-05-10 21:13:54.365150623 +0200
-@@ -5553,7 +5553,7 @@ $as_echo_n "checking for the kernel vers
-         kernel=`uname -r`
- 
-         case "${kernel}" in
--             2.6.*|3.*)
-+             2.6.*|[3-9].*)
-         	    { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.6.x/3.x family (${kernel})" >&5
- $as_echo "2.6.x/3.x family (${kernel})" >&6; }
- 
diff --git a/srcpkgs/valgrind/patches/valgrind-3.9.0-glibc-2.19.patch b/srcpkgs/valgrind/patches/valgrind-3.9.0-glibc-2.19.patch
deleted file mode 100644
index ceebb029590..00000000000
--- a/srcpkgs/valgrind/patches/valgrind-3.9.0-glibc-2.19.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure	2013-11-01 09:33:32.000000000 +1000
-+++ configure	2014-02-08 09:28:06.063248544 +1000
-@@ -6689,6 +6689,16 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.19|2.20|2.21)
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5
-+$as_echo "2.19 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_19 1" >>confdefs.h
-+
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      darwin)
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
---- configure.ac	2013-11-01 09:28:16.000000000 +1000
-+++ configure.ac	2014-02-08 09:27:38.870385366 +1000
-@@ -918,6 +918,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.19|2.20|2.21)
-+	AC_MSG_RESULT(2.19 family)
-+	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      darwin)
- 	AC_MSG_RESULT(Darwin)
- 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index ccdbc9a77c7..0cff2d3878e 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,7 +1,7 @@
 # Template file for 'valgrind'
 pkgname=valgrind
-version=3.10.1
-revision=3
+version=3.11.0
+revision=1
 only_for_archs="i686 x86_64 armv7l"
 build_style=gnu-configure
 configure_args="--enable-tls --with-mpicc=/dev/null"
@@ -13,14 +13,17 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://valgrind.org/"
 license="GPL-2"
 distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2"
-checksum=fa253dc26ddb661b6269df58144eff607ea3f76a9bcfe574b0c7726e1dfcb997
+checksum=6c396271a8c1ddd5a6fb9abe714ea1e8a86fce85b30ab26b4266aeb4c2413b42
+
+CFLAGS="-fno-stack-protector"
+CXXFLAGS="-fno-stack-protector"
 
 if [ "$XBPS_TARGET_MACHINE" = "armv7l" ]; then
 	configure_args+=" ac_cv_host=armv7l-unknown-linux-gnueabihf"
 fi
 
 valgrind-devel_package() {
-	depends="valgrind>=${version}"
+	depends="valgrind>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include