diff -Nru exim4-4.89/debian/changelog exim4-4.89/debian/changelog
--- exim4-4.89/debian/changelog	2017-06-01 09:59:14.000000000 +0000
+++ exim4-4.89/debian/changelog	2017-06-27 14:20:42.000000000 +0000
@@ -1,3 +1,23 @@
+exim4 (4.89-3ubuntu1) artful; urgency=medium
+
+  * Merge from Debian. Remaining changes:
+    - Show Ubuntu distribution in SMTP banner.
+    - Build-Depends on lsb-release (needed for the Ubuntu SMTP banner patch)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 27 Jun 2017 10:20:42 -0400
+
+exim4 (4.89-3) unstable; urgency=high
+
+  * Re-upload to unstable.
+
+ -- Andreas Metzler <ametzler@debian.org>  Mon, 19 Jun 2017 18:51:13 +0200
+
+exim4 (4.89-2+deb9u1) stretch-security; urgency=medium
+
+  * CVE-2017-100369
+
+ --  <jmm@debian.org>  Wed, 14 Jun 2017 07:03:07 +0200
+
 exim4 (4.89-2ubuntu1) artful; urgency=medium
 
   * Merge from Debian testing.
diff -Nru exim4-4.89/debian/patches/79_CVE-2017-1000369.patch exim4-4.89/debian/patches/79_CVE-2017-1000369.patch
--- exim4-4.89/debian/patches/79_CVE-2017-1000369.patch	1970-01-01 00:00:00.000000000 +0000
+++ exim4-4.89/debian/patches/79_CVE-2017-1000369.patch	2017-06-19 16:47:52.000000000 +0000
@@ -0,0 +1,43 @@
+commit 65e061b76867a9ea7aeeb535341b790b90ae6c21
+Author: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
+Date:   Wed May 31 23:08:56 2017 +0200
+
+    Cleanup (prevent repeated use of -p/-oMr to avoid mem leak)
+
+diff --git a/src/exim.c b/src/exim.c
+index 67583e5..88e1197 100644
+--- a/src/exim.c
++++ b/src/exim.c
+@@ -3106,7 +3106,14 @@ for (i = 1; i < argc; i++)
+ 
+       /* -oMr: Received protocol */
+ 
+-      else if (Ustrcmp(argrest, "Mr") == 0) received_protocol = argv[++i];
++      else if (Ustrcmp(argrest, "Mr") == 0)
++
++        if (received_protocol)
++          {
++          fprintf(stderr, "received_protocol is set already\n");
++          exit(EXIT_FAILURE);
++          }
++        else received_protocol = argv[++i];
+ 
+       /* -oMs: Set sender host name */
+ 
+@@ -3202,7 +3209,15 @@ for (i = 1; i < argc; i++)
+ 
+     if (*argrest != 0)
+       {
+-      uschar *hn = Ustrchr(argrest, ':');
++      uschar *hn;
++
++      if (received_protocol)
++        {
++        fprintf(stderr, "received_protocol is set already\n");
++        exit(EXIT_FAILURE);
++        }
++
++      hn = Ustrchr(argrest, ':');
+       if (hn == NULL)
+         {
+         received_protocol = argrest;
diff -Nru exim4-4.89/debian/patches/series exim4-4.89/debian/patches/series
--- exim4-4.89/debian/patches/series	2017-06-01 09:32:16.000000000 +0000
+++ exim4-4.89/debian/patches/series	2017-06-27 14:20:42.000000000 +0000
@@ -9,4 +9,5 @@
 67_unnecessaryCopt.diff
 70_remove_exim-users_references.dpatch
 78_Disable-chunking-BDAT-by-default.patch
+79_CVE-2017-1000369.patch
 fix_smtp_banner.patch