diff -Nru xplc-0.3.13/debian/changelog xplc-0.3.13/debian/changelog
--- xplc-0.3.13/debian/changelog	2016-05-23 21:31:44.000000000 +0000
+++ xplc-0.3.13/debian/changelog	2017-05-21 17:06:24.000000000 +0000
@@ -1,3 +1,12 @@
+xplc (0.3.13-7) unstable; urgency=medium
+
+  * QA upload.
+  * Fix buffer overflow in uuidcdef.
+    Thanks to Chris West <solo-debianbugs@goeswhere.com> (Closes: #858178)
+  * Mark other patches as forwarded.
+
+ -- Reiner Herrmann <reiner@reiner-h.de>  Sun, 21 May 2017 19:06:24 +0200
+
 xplc (0.3.13-6) unstable; urgency=low
 
   [ Reiner Herrmann ]
diff -Nru xplc-0.3.13/debian/patches/001-hurd-ftbfs.patch xplc-0.3.13/debian/patches/001-hurd-ftbfs.patch
--- xplc-0.3.13/debian/patches/001-hurd-ftbfs.patch	2016-05-23 17:26:33.000000000 +0000
+++ xplc-0.3.13/debian/patches/001-hurd-ftbfs.patch	2017-05-21 17:06:24.000000000 +0000
@@ -2,6 +2,7 @@
 Description: Fixes building on hurd.
 Bug-Debian: https://bugs.debian.org/686267
 Bug-Debian: https://bugs.debian.org/671384
+Forwarded: https://github.com/xplc/xplc/pull/4
 
 Index: xplc-0.3.13/xplc/modulemgr.cpp
 ===================================================================
diff -Nru xplc-0.3.13/debian/patches/003-honour-cppflags.patch xplc-0.3.13/debian/patches/003-honour-cppflags.patch
--- xplc-0.3.13/debian/patches/003-honour-cppflags.patch	2016-05-23 17:26:33.000000000 +0000
+++ xplc-0.3.13/debian/patches/003-honour-cppflags.patch	2017-05-21 17:06:24.000000000 +0000
@@ -1,5 +1,6 @@
 Author: Reiner Herrmann <reiner@reiner-h.de>
 Description: Honour CPPFLAGS for proper hardening support
+Forwarded: https://github.com/xplc/xplc/pull/2
 
 --- a/config/config.mk.in
 +++ b/config/config.mk.in
diff -Nru xplc-0.3.13/debian/patches/004-reproducible-build.patch xplc-0.3.13/debian/patches/004-reproducible-build.patch
--- xplc-0.3.13/debian/patches/004-reproducible-build.patch	2016-05-23 17:26:33.000000000 +0000
+++ xplc-0.3.13/debian/patches/004-reproducible-build.patch	2017-05-21 17:06:24.000000000 +0000
@@ -1,5 +1,6 @@
 Author: Reiner Herrmann <reiner@reiner-h.de>
 Description: Sort object files for deterministic linking order
+Forwarded: https://github.com/xplc/xplc/pull/3
 
 --- a/xplc/rules.mk
 +++ b/xplc/rules.mk
diff -Nru xplc-0.3.13/debian/patches/005-buffer-overflow.patch xplc-0.3.13/debian/patches/005-buffer-overflow.patch
--- xplc-0.3.13/debian/patches/005-buffer-overflow.patch	1970-01-01 00:00:00.000000000 +0000
+++ xplc-0.3.13/debian/patches/005-buffer-overflow.patch	2017-05-21 17:06:24.000000000 +0000
@@ -0,0 +1,25 @@
+Author: Chris West <solo-debianbugs@goeswhere.com>
+Description: Increase buffer size to fix overflow
+Bug-Debian: https://bugs.debian.org/858178
+Forwarded: https://github.com/xplc/xplc/pull/1
+
+--- a/uuid/bin/uuidgen.c
++++ b/uuid/bin/uuidgen.c
+@@ -239,7 +239,7 @@
+ 
+ 
+ typedef const char* (*uuid_output_fn_t)(const uuid_t);
+-static char uuid_unparse_buf[60];
++static char uuid_unparse_buf[80];
+ const char* uuid_unparse_x_(const uuid_t uuid) {
+   /* This function implicitly trusts uuid_unparse. */
+   unsigned int a, b, c, d, e, f, g, h, i, j, k;
+@@ -249,7 +249,7 @@
+                "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+                &a, &b, &c, &d, &e, &f, &g, &h, &i, &j, &k);
+   if(ret != 11) {
+-    uuid_unparse_buf[59] = '\0';
++    uuid_unparse_buf[79] = '\0';
+     fprintf(stderr,
+             "%s: libuuid error at %s:%d\n", program, __FILE__, __LINE__);
+     fprintf(stderr,
diff -Nru xplc-0.3.13/debian/patches/series xplc-0.3.13/debian/patches/series
--- xplc-0.3.13/debian/patches/series	2016-05-23 17:26:33.000000000 +0000
+++ xplc-0.3.13/debian/patches/series	2017-05-21 17:06:24.000000000 +0000
@@ -2,3 +2,4 @@
 002-fix-as-needed.patch
 003-honour-cppflags.patch
 004-reproducible-build.patch
+005-buffer-overflow.patch