diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9f26e0aa107..793652759bf 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.113 2017/03/08 17:05:34 sthen Exp $
+# $OpenBSD: Makefile,v 1.114 2017/11/25 13:04:53 sthen Exp $
 
 COMMENT-main =		flexible mail transfer agent
 COMMENT-eximon =	X11 monitor tool for Exim MTA
 
 VERSION =		4.89
+REVISION-main =		0
 DISTNAME =		exim-${VERSION}
 PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
diff --git a/mail/exim/patches/patch-src_receive_c b/mail/exim/patches/patch-src_receive_c
new file mode 100644
index 00000000000..1b60118e290
--- /dev/null
+++ b/mail/exim/patches/patch-src_receive_c
@@ -0,0 +1,20 @@
+$OpenBSD: patch-src_receive_c,v 1.1 2017/11/25 13:04:53 sthen Exp $
+
+https://lists.exim.org/lurker/message/20171125.034842.d1d75cac.en.html
+https://bugs.exim.org/show_bug.cgi?id=2199
+
+Index: src/receive.c
+--- src/receive.c.orig
++++ src/receive.c
+@@ -1782,9 +1782,10 @@ for (;;)
+     header_size *= 2;
+     if (!store_extend(next->text, oldsize, header_size))
+       {
++      BOOL release_ok = store_last_get[store_pool] == next->text;
+       uschar *newtext = store_get(header_size);
+       memcpy(newtext, next->text, ptr);
+-      store_release(next->text);
++      if (release_ok) store_release(next->text);
+       next->text = newtext;
+       }
+     }