diff --git a/valgrind-3.12.0-nocwd-cleanup.patch b/valgrind-3.12.0-nocwd-cleanup.patch
new file mode 100644
index 0000000..fdb736d
--- /dev/null
+++ b/valgrind-3.12.0-nocwd-cleanup.patch
@@ -0,0 +1,23 @@
+commit b02baf74e6c14cc6fcf1e4fa94f1a6734c9cffbe
+Author: mjw <mjw@a5019735-40e9-0310-863c-91ae7b9d1cf9>
+Date:   Sat Nov 12 19:51:51 2016 +0000
+
+    Cleanup none/tests/nocwd.vgtest tmp dirs.
+    
+    The none/tests/nocwd creates a really deep temporary directory structure
+    that is also inaccessible after the test. This causes issues with some
+    build wrappers like koji which fail to cleanup such deep subdirectories.
+    So explicitly cleanup the directory after the test.
+    
+    https://bugzilla.redhat.com/show_bug.cgi?id=1390282
+    
+    git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16134 a5019735-40e9-0310-863c-91ae7b9d1cf9
+
+diff --git a/none/tests/nocwd.vgtest b/none/tests/nocwd.vgtest
+index 74e2b4a..f8d4c3b 100644
+--- a/none/tests/nocwd.vgtest
++++ b/none/tests/nocwd.vgtest
+@@ -1,2 +1,3 @@
+ prog: nocwd
+ vgopts: -q --trace-children=yes
++cleanup: chmod u+rwx /tmp/wd_test_*; rm -rf /tmp/wd_test_*
diff --git a/valgrind.spec b/valgrind.spec
index 55561b5..90bf8d0 100644
--- a/valgrind.spec
+++ b/valgrind.spec
@@ -3,7 +3,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: %{?scl_prefix}valgrind
 Version: 3.12.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 License: GPLv2+
 URL: http://www.valgrind.org/
@@ -72,6 +72,10 @@ Patch3: valgrind-3.9.0-ldso-supp.patch
 # KDE#371396 - workaround helgrind and drd pth_cond_destroy_busy testcase hangs
 Patch4: valgrind-3.12.0-skip-cond-var.patch
 
+# RHBZ#1390282 upstream svn r16134
+# Cleanup none/tests/nocwd.vgtest tmp dirs.
+Patch5: valgrind-3.12.0-nocwd-cleanup.patch
+
 %if %{build_multilib}
 # Ensure glibc{,-devel} is installed for both multilib arches
 BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so
@@ -185,6 +189,7 @@ Valgrind User Manual for details.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # We need to use the software collection compiler and binutils if available.
@@ -378,6 +383,9 @@ echo ===============END TESTING===============
 %endif
 
 %changelog
+* Sat Nov 12 2016 Mark Wielaard <mjw@redhat.com> - 3.12.0-3
+- Add valgrind-3.12.0-nocwd-cleanup.patch (#1390282)
+
 * Fri Oct 21 2016 Orion Poplawski <orion@cora.nwra.com> - 1:3.12.0-2
 - Rebuild for openmpi 2.0