diff -Nru tcl8.6-8.6.5+dfsg/debian/changelog tcl8.6-8.6.5+dfsg/debian/changelog
--- tcl8.6-8.6.5+dfsg/debian/changelog	2016-03-03 13:18:03.000000000 +0000
+++ tcl8.6-8.6.5+dfsg/debian/changelog	2016-03-21 12:35:14.000000000 +0000
@@ -1,3 +1,13 @@
+tcl8.6 (8.6.5+dfsg-2) unstable; urgency=medium
+
+  * Applied a patch by Hirofumi Ogawa to fix a segfault on exit if run on
+    hardware supporting HLE/RTM extensions (closes: #818697, #817824).
+  * Sort the object files inside the static library using the C locale to make
+    the build reproducible (closes: #818750).
+  * Bumped standards version to 3.9.7.
+
+ -- Sergei Golovan <sgolovan@debian.org>  Mon, 21 Mar 2016 15:35:01 +0300
+
 tcl8.6 (8.6.5+dfsg-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru tcl8.6-8.6.5+dfsg/debian/control tcl8.6-8.6.5+dfsg/debian/control
--- tcl8.6-8.6.5+dfsg/debian/control	2015-05-05 11:28:56.000000000 +0000
+++ tcl8.6-8.6.5+dfsg/debian/control	2016-03-21 12:35:23.000000000 +0000
@@ -4,7 +4,7 @@
 Maintainer: Debian Tcl/Tk Packagers <pkg-tcltk-devel@lists.alioth.debian.org>
 Uploaders: Sergei Golovan <sgolovan@debian.org>
 Build-Depends: debhelper (>= 9.0.0), dpkg-dev (>= 1.16.1~), zlib1g-dev
-Standards-Version: 3.9.6
+Standards-Version: 3.9.7
 Homepage: http://www.tcl.tk/
 
 Package: tcl8.6
diff -Nru tcl8.6-8.6.5+dfsg/debian/patches/finalize-notifier.diff tcl8.6-8.6.5+dfsg/debian/patches/finalize-notifier.diff
--- tcl8.6-8.6.5+dfsg/debian/patches/finalize-notifier.diff	1970-01-01 00:00:00.000000000 +0000
+++ tcl8.6-8.6.5+dfsg/debian/patches/finalize-notifier.diff	2016-03-21 12:32:31.000000000 +0000
@@ -0,0 +1,20 @@
+Author: Hirofumi Ogawa <hirofumi@mail.parknet.co.jp>
+Description: Patch fixes segfault on exit for modern hardware.
+Last-Modified: Mon, 21 Mar 2016 15:31:38 +0300
+Bug: http://core.tcl.tk/tcl/tktview?name=d3071887db
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=818697
+
+--- a/unix/tclUnixNotfy.c
++++ b/unix/tclUnixNotfy.c
+@@ -433,9 +433,11 @@
+ 			    "unable to write q to triggerPipe");
+ 		}
+ 		close(triggerPipe);
++		pthread_mutex_lock(&notifierMutex);
+ 		while(triggerPipe != -1) {
+ 		    pthread_cond_wait(&notifierCV, &notifierMutex);
+ 		}
++		pthread_mutex_unlock(&notifierMutex);
+ 		if (notifierThreadRunning) {
+ 		    int result = pthread_join((pthread_t) notifierThread, NULL);
+ 
diff -Nru tcl8.6-8.6.5+dfsg/debian/patches/series tcl8.6-8.6.5+dfsg/debian/patches/series
--- tcl8.6-8.6.5+dfsg/debian/patches/series	2014-03-08 04:55:43.000000000 +0000
+++ tcl8.6-8.6.5+dfsg/debian/patches/series	2016-03-21 12:32:59.000000000 +0000
@@ -4,3 +4,4 @@
 confsearch.diff
 non-linux.diff
 manpages.diff
+finalize-notifier.diff
diff -Nru tcl8.6-8.6.5+dfsg/debian/rules tcl8.6-8.6.5+dfsg/debian/rules
--- tcl8.6-8.6.5+dfsg/debian/rules	2016-03-03 13:18:27.000000000 +0000
+++ tcl8.6-8.6.5+dfsg/debian/rules	2016-03-21 12:27:17.000000000 +0000
@@ -50,6 +50,7 @@
 	$(MAKE) -C unix
 	# Build the static library
 	cd unix && \
+	  LC_ALL=C \
 	  ar cr libtcl$(v).a *.o && \
 	  ar d libtcl$(v).a tclAppInit.o && \
 	  ranlib libtcl$(v).a