diff --git a/debian/changelog b/debian/changelog
index 0c0394968a..adec7a8508 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
-rustc (1.6.0+dfsg1-3) UNRELEASED; urgency=medium
+rustc (1.6.0+dfsg1-3) unstable; urgency=medium
 
+  * Apply upstream fix to silent a valgrind issue in the test suite
+    (Closes: ##812825)
   * Add gcc & libc-dev as dependency of rustc to make sure it works
     out of the box
 
+  [ Ximin Luo ]
+  * Work around rust bug https://github.com/rust-lang/rust/issues/31529
+  * Enable optional tests, and add verbosity/backtraces to tests
+  * Use XZ instead of GZ compression (will apply to the next new upload)
+
  -- Sylvestre Ledru <sylvestre@debian.org>  Tue, 02 Feb 2016 15:08:11 +0100
 
 rustc (1.6.0+dfsg1-2) unstable; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index af310b5bb4..535ccfb631 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ rust-gdb-paths
 rust-lldb-paths
 add-soname
 wno-error
+valgrind-workaround.diff
diff --git a/debian/patches/valgrind-workaround.diff b/debian/patches/valgrind-workaround.diff
new file mode 100644
index 0000000000..45b5a589c6
--- /dev/null
+++ b/debian/patches/valgrind-workaround.diff
@@ -0,0 +1,13 @@
+diff --git a/src/test/run-pass-valgrind/down-with-thread-dtors.rs b/src/test/run-pass-valgrind/down-with-thread-dtors.rs
+index 5c449d5..0bf10c6 100644
+--- a/src/test/run-pass-valgrind/down-with-thread-dtors.rs
++++ b/src/test/run-pass-valgrind/down-with-thread-dtors.rs
+@@ -8,6 +8,8 @@
+ // option. This file may not be copied, modified, or distributed
+ // except according to those terms.
+ 
++// no-prefer-dynamic
++
+ thread_local!(static FOO: Foo = Foo);
+ thread_local!(static BAR: Bar = Bar(1));
+ thread_local!(static BAZ: Baz = Baz);