diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index bcff940003d..b789f63b850 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,7 +1,7 @@
 # Template file for 'valgrind'
 pkgname=valgrind
 version=3.6.1
-revision=1
+revision=2
 patch_args="-Np1"
 distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
@@ -19,6 +19,12 @@ long_desc="
  detect a lot of problems that are otherwise very hard to find/diagnose."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc	"<=2.14.[0-9]*"
+Add_dependency run glibc	">=2.14<2.15"
 Add_dependency full perl	">=0"
 Add_dependency build pkg-config
+
+pre_configure()
+{
+	# 3.0 shouldn't be treated differently than 2.6 Linux kernels...
+	sed -i -e "s|2.6.\*)|3.0.\*)|" configure
+}