diff --git a/mail/exim/files/Makefile b/mail/exim/files/Makefile
index 77dcab7e941..674db1229ca 100644
--- a/mail/exim/files/Makefile
+++ b/mail/exim/files/Makefile
@@ -293,6 +293,15 @@ EXIM_PERL=perl.o
 # EXIM_GID above, then that uid and gid must be able to create files in the
 # directory you have specified.
 
+# You can also configure Exim to use syslog, instead of or as well as log
+# files, by settings such as these
+
+# LOG_FILE_PATH=syslog
+# LOG_FILE_PATH=syslog:/var/log/exim_%slog
+
+# Do not include white space in such a setting as it messes up the building
+# process.
+
 # You do not have to define the log file path here; an option in the runtime
 # configuration file can also set it, and that overrides any setting here.
 # However, it is recommended that you set it here if it is a fixed path, so
@@ -331,15 +340,16 @@ LOOKUP_CDB=yes
 # LOOKUP_MYSQL=yes
 LOOKUP_NIS=yes
 # LOOKUP_NISPLUS=yes
+# LOOKUP_PGSQL=yes
 
 # Additional libraries and include directories may be required for some
-# lookup styles, e.g. LDAP or MYSQL. LOOKUP_LIBS is included only on the
-# command for linking Exim itself, not on any auxiliary programs. You
+# lookup styles, e.g. LDAP, MYSQL or PGSQL. LOOKUP_LIBS is included only on
+# the command for linking Exim itself, not on any auxiliary programs. You
 # don't need to set LOOKUP_INCLUDE if the relevant directories are already
 # specified in INCLUDE.
 
-# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include
-# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient
+# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include
+# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq
 
 # If you have set LDAP=yes, you should set LDAP_LIB_TYPE to indicate which LDAP
 # library you have. Unfortunately, though most of their functions are the
diff --git a/mail/exim/files/md5 b/mail/exim/files/md5
index 9de05c3e42c..f3eff7bd687 100644
--- a/mail/exim/files/md5
+++ b/mail/exim/files/md5
@@ -1,6 +1,6 @@
-SHA1 (exim-texinfo-3.10.tar.gz) = 2c89fb3073dd079c19682d33a56a46c9fd863978
-RMD160 (exim-texinfo-3.10.tar.gz) = b2cab8092eb776a1551f418e6af94a9ccc8f2023
+MD5 (exim-3.14.tar.gz) = 271b4b7f5a2e6c292d0c69f1d44dc013
 MD5 (exim-texinfo-3.10.tar.gz) = c8c2596e6a303f774e0a627e61b4dffc
-MD5 (exim-3.13.tar.gz) = d4821c12e75814ddeb9a304d58c1e248
-SHA1 (exim-3.13.tar.gz) = 1e5eb1a82d028ca3727563b914e4dec2476002c3
-RMD160 (exim-3.13.tar.gz) = 585af18b40fbf1e955619dcd7fec68e7559686f6
+RMD160 (exim-3.14.tar.gz) = 9b38689a4f5bbaa8fd7b5ee64fa298d7f86652df
+RMD160 (exim-texinfo-3.10.tar.gz) = b2cab8092eb776a1551f418e6af94a9ccc8f2023
+SHA1 (exim-3.14.tar.gz) = bdf1bc27fa9a5d2ec09eb5148ee1024f58e01dfe
+SHA1 (exim-texinfo-3.10.tar.gz) = 2c89fb3073dd079c19682d33a56a46c9fd863978
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
new file mode 100644
index 00000000000..f1f243bb26d
--- /dev/null
+++ b/mail/exim/patches/patch-aa
@@ -0,0 +1,19 @@
+--- src/transports/appendfile.c.orig	Sat Apr 22 12:20:32 2000
++++ src/transports/appendfile.c	Sat Apr 22 13:20:23 2000
+@@ -2330,9 +2330,16 @@
+ #ifdef SUPPORT_MBX
+ if (yield == OK && ob->mbx_format)
+   {
++#if OpenBSD
++  char tempbuf[] = "/tmp/exim.XXXXXXXXXX";
++
++  tempname = tempbuf;
++  if ((temp_fd = mkstemp(tempname)) == -1 || unlink(tempname) < 0)
++#else
+   tempname = tmpnam(NULL);
+   if ((temp_fd = open(tempname, (O_RDWR|O_CREAT|O_TRUNC), 0600)) < 0 ||
+       unlink(tempname) < 0)
++#endif
+     {
+     addr->basic_errno = errno;
+     addr->message = string_sprintf("while setting up temporary file %s",
diff --git a/mail/exim/pkg/PLIST b/mail/exim/pkg/PLIST
index 50322ad6cb9..87959966212 100644
--- a/mail/exim/pkg/PLIST
+++ b/mail/exim/pkg/PLIST
@@ -22,7 +22,7 @@ info/exim_filter.info
 @exec install-info --section="Exim" --entry "* Overview: (exim_overview).    Overview of the Exim system" %D/info/exim_overview.info %D/info/dir
 @exec install-info --section="Exim" --entry "* User guide: (exim).           Exim manual" %D/info/exim.info %D/info/dir
 @exec install-info --section="Exim" --entry "* Filtering: (exim_filter).     Filtering mail with Exim" %D/info/exim_filter.info %D/info/dir
-@exec [ -d /etc/exim ] || install -d /etc/exim
+@exec [ -d /etc/exim ] || mkdir /etc/exim
 @cwd /etc/exim
 configure.sample
 @exec [ -f %D/configure ] || install -m 644 %D/configure.sample %D/configure