diff --git a/srcpkgs/valgrind/patches/glibc-patch-version.patch b/srcpkgs/valgrind/patches/glibc-patch-version.patch
new file mode 100644
index 0000000000..63f5abe740
--- /dev/null
+++ b/srcpkgs/valgrind/patches/glibc-patch-version.patch
@@ -0,0 +1,51 @@
+Saves having to rebuild valgrind on glibc-x.x.* patch level releases
+
+--- glibc-2.X.supp.in.o	2009-08-19 23:37:48.000000000 +1000
++++ glibc-2.X.supp.in	2010-05-22 19:43:08.088007038 +1000
+@@ -168,9 +168,9 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:__sendto_nocancel
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+    glibc24-64bit-padding-1c
+@@ -180,7 +180,7 @@
+    fun:__nscd_get_map_ref
+    fun:nscd_get*_r
+    fun:*nscd*
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ 
+ 
+@@ -199,18 +199,18 @@
+    Memcheck:Param
+    socketcall.sendto(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ {
+    X11-64bit-padding-4b
+    Memcheck:Param
+    socketcall.send(msg)
+    fun:send
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
+-   obj:/*libc-@GLIBC_VERSION@.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
++   obj:/*libc-@GLIBC_VERSION@*.so
+ }
+ 
+ ##----------------------------------------------------------------------##
diff --git a/srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch b/srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch
deleted file mode 100644
index cb7bc4e6ed..0000000000
--- a/srcpkgs/valgrind/patches/valgrind-3.5.0-glibc-2.11.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- configure.in	2009-11-07 23:34:37.000000000 +0100
-+++ configure.in	2009-11-07 23:38:14.000000000 +0100
-@@ -656,6 +656,16 @@
- ],
- GLIBC_VERSION="2.10")
- 
-+AC_EGREP_CPP([GLIBC_211], [
-+#include <features.h>
-+#ifdef __GNU_LIBRARY__
-+ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ == 11)
-+  GLIBC_211
-+ #endif
-+#endif
-+],
-+GLIBC_VERSION="2.11")
-+
- AC_EGREP_CPP([AIX5_LIBC], [
- #include <standards.h>
- #if defined(_AIXVERSION_510) || defined(_AIXVERSION_520) || defined(_AIXVERSION_530)
-@@ -742,6 +752,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.11)
-+	AC_MSG_RESULT(2.11 family)
-+	AC_DEFINE([GLIBC_2_11], 1, [Define to 1 if you're using glibc 2.11.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}"
-+	;;
-      aix5)
- 	AC_MSG_RESULT(AIX 5.1 or 5.2 or 5.3)
- 	AC_DEFINE([AIX5_LIBC], 1, [Define to 1 if you're using AIX 5.1 or 5.2 or 5.3])
-@@ -755,7 +772,7 @@
- 
-      *)
- 	AC_MSG_RESULT(unsupported version)
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.10])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.11])
- 	AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
diff --git a/srcpkgs/valgrind/template b/srcpkgs/valgrind/template
index 6e01bd06f2..50b2d7b188 100644
--- a/srcpkgs/valgrind/template
+++ b/srcpkgs/valgrind/template
@@ -1,13 +1,12 @@
 # Template file for 'valgrind'
 pkgname=valgrind
-version=3.5.0
-revision=1
+version=3.6.0
 distfiles="http://www.valgrind.org/downloads/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-tls"
 short_desc="Tool for finding memory management bugs in programs"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=743a5132bbebc247169aefae6e17657677fdf0961aba1668dd4ee7028d27ba80
+checksum=bc0f0153b5a47b986f1d8efa2c488e0aea85a1cf2c4b11c52be127903080285f
 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
@@ -16,12 +15,7 @@ long_desc="
  detect a lot of problems that are otherwise very hard to find/diagnose."
 
 subpackages="$pkgname-devel"
-Add_dependency run glibc
-Add_dependency full perl
+Add_dependency run glibc	">=2.12<2.13"
+Add_dependency full perl	">=0"
 Add_dependency build pkg-config
 Add_dependency build automake
-
-pre_configure()
-{
-	cd ${wrksrc} && autoreconf -fi
-}
diff --git a/srcpkgs/valgrind/valgrind-devel.template b/srcpkgs/valgrind/valgrind-devel.template
index 3af1830754..50357bc61f 100644
--- a/srcpkgs/valgrind/valgrind-devel.template
+++ b/srcpkgs/valgrind/valgrind-devel.template
@@ -9,8 +9,11 @@ Add_dependency run valgrind
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/usr/lib
+	install -d ${DESTDIR}/usr/lib/valgrind
+	install -d ${DESTDIR}/usr/share
 
 	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
 	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/valgrind/*.a ${DESTDIR}/usr/lib/valgrind
+	mv ${SRCPKGDESTDIR}/usr/share/doc ${DESTDIR}/usr/share
 }