diff --git a/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch b/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch
new file mode 100644
index 00000000000..28a1a604f16
--- /dev/null
+++ b/srcpkgs/valgrind/patches/valgrind-3.8.1-glibc-2.17.patch
@@ -0,0 +1,36 @@
+--- configure	2012-09-19 05:19:23.000000000 +1000
++++ configure	2012-12-27 08:11:36.645429011 +1000
+@@ -6612,6 +6612,24 @@
+
+	# DEFAULT_SUPP set by kernel version check above.
+	;;
++     2.17)
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.17 family" >&5
++$as_echo "2.17 family" >&6; }
++
++$as_echo "#define GLIBC_2_17 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; }
++
++$as_echo "#define DARWIN_LIBC 1" >>confdefs.h
++
++	# DEFAULT_SUPP set by kernel version check above.
++	;;
+      bionic)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Bionic" >&5
+ $as_echo "Bionic" >&6; }
+@@ -6624,7 +6642,7 @@
+      *)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
+ $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
+-	as_fn_error "Valgrind requires glibc version 2.2 - 2.16" "$LINENO" 5
++	as_fn_error "Valgrind requires glibc version 2.2 - 2.17" "$LINENO" 5
+	as_fn_error "or Darwin libc" "$LINENO" 5
+	;;
+ esac
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 4ec02cece81..91f1396e79a 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,22 +1,16 @@
 # Template file for 'valgrind'
 pkgname=valgrind
 version=3.8.1
-revision=1
-subpackages="$pkgname-devel"
+revision=2
+subpackages="${pkgname}-devel"
 build_style=gnu-configure
 configure_args="--enable-tls --with-mpicc=/dev/null"
-depends="glibc>=2.16<2.17"
+depends="glibc>=2.17<2.18"
 makedepends="pkg-config"
 fulldepends="perl>=0"
 short_desc="Tool for finding memory management bugs in programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://valgrind.org/"
 license="GPL-2"
-distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
+distfiles="http://www.valgrind.org/downloads/${pkgname}-${version}.tar.bz2"
 checksum=473be00576bed311a662b277a2bfbe97d9cca4058e68619a0e420c9fc19958db
-long_desc="
- Valgrind is a tool to help you find memory-management problems in your
- programs. When a program is run under Valgrind's supervision, all
- reads and writes of memory are checked, and calls to
- malloc/new/free/delete are intercepted. As a result, Valgrind can
- detect a lot of problems that are otherwise very hard to find/diagnose."
diff --git a/srcpkgs/valgrind/valgrind-devel.template b/srcpkgs/valgrind/valgrind-devel.template
index 712d5bd6f89..ca396067c09 100644
--- a/srcpkgs/valgrind/valgrind-devel.template
+++ b/srcpkgs/valgrind/valgrind-devel.template
@@ -1,14 +1,9 @@
 # Template file for 'valgrind-devel'.
 #
-depends="valgrind"
+depends="valgrind>=${version}"
 short_desc="${short_desc} (development files)"
-long_desc="${long_desc}
 
- This package contains files for development, headers, static libs, etc."
-
-
-do_install()
-{
+do_install() {
 	install -d ${DESTDIR}/usr/lib/valgrind
 	install -d ${DESTDIR}/usr/share