diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index bc33e170f14..6c88a10a156 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2000/04/26 09:40:57 peter Exp $
+# $OpenBSD: Makefile,v 1.13 2000/06/04 22:42:05 espie Exp $
 #
 
 DISTNAME=	exim-3.14
 CATEGORIES=	mail
-FAKE=No
+#FAKE=No
 
 MAINTAINER=	peter.galbavy@knowledge.com
 
@@ -25,26 +25,11 @@ do-configure:
 	done )
 
 pre-install:
-	${INSTALL} -d /etc/exim
+	${INSTALL} -d ${DESTDIR}/etc/exim
 
 post-install:
-	@cp ${WRKSRC}/src/configure.default /etc/exim/configure.sample
-	@echo "EXIM is installed. You must now edit /etc/exim/configure"
-	@echo "and set the correct values for your system."
-	@echo
-	@echo "It is strongly advised that you configure exim to use"
-	@echo "a UID and GID other that 0/0. You can do this by adding"
-	@echo "lines to the configure file like this:"
-	@echo
-	@echo "\texim_user = \"nobody\""
-	@echo "\texim_group = \"nogroup\""
-	@echo
-	@echo "but you must remember to allow that user write"
-	@echo "permissions to /var/log/exim and /var/spool/exim"
-	@echo
-	@echo "If you intend replacing sendmail with exim, then don't"
-	@echo "forget to modify /etc/mailer.conf accordingly."
-	@echo
+	${INSTALL_DATA_DIR}	${PREFIX}/lib/exim
+	@cp ${WRKSRC}/src/configure.default ${PREFIX}/lib/exim/configure.sample
 
 
 .include <bsd.port.mk>
diff --git a/mail/exim/patches/patch-Makefile b/mail/exim/patches/patch-Makefile
new file mode 100644
index 00000000000..b12839827a9
--- /dev/null
+++ b/mail/exim/patches/patch-Makefile
@@ -0,0 +1,17 @@
+$OpenBSD: patch-Makefile,v 1.1 2000/06/04 22:42:06 espie Exp $
+--- Makefile.orig	Wed Apr 12 11:44:50 2000
++++ Makefile	Mon Jun  5 00:34:11 2000
+@@ -65,7 +65,12 @@ go:; @cd build-$(buildname); $(MAKE) SHE
+ # The installation commands are kept in a separate script, which expects
+ # to be run from inside the build directory.
+ 
+-install:; 	@cd build-$(buildname); $(SHELL) ../scripts/exim_install
++install:
++	@cd build-$(buildname); \
++    INST_BIN_DIRECTORY=$(DESTDIR)/usr/local/sbin \
++    INST_INFO_DIRECTORY=${DESTDIR}/usr/local/info \
++    INST_CONFIGURE_FILE=${DESTDIR}/etc/exim/configure \
++    $(SHELL) ../scripts/exim_install
+ 
+ # Tidy-up targets
+ 
diff --git a/mail/exim/patches/patch-aa b/mail/exim/patches/patch-aa
index f1f243bb26d..7904167240d 100644
--- a/mail/exim/patches/patch-aa
+++ b/mail/exim/patches/patch-aa
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/transports/appendfile.c.orig	Wed Apr 12 11:44:59 2000
++++ src/transports/appendfile.c	Mon Jun  5 00:14:52 2000
+@@ -2330,9 +2330,16 @@ opened, so that it goes away on closure.
  #ifdef SUPPORT_MBX
  if (yield == OK && ob->mbx_format)
    {
diff --git a/mail/exim/pkg/MESSAGE b/mail/exim/pkg/MESSAGE
new file mode 100644
index 00000000000..a16561a9574
--- /dev/null
+++ b/mail/exim/pkg/MESSAGE
@@ -0,0 +1,16 @@
+EXIM is installed. You must now edit /etc/exim/configure
+and set the correct values for your system.
+
+It is strongly advised that you configure exim to use
+a UID and GID other that 0/0. You can do this by adding
+lines to the configure file like this:
+
+\texim_user = "nobody"
+\texim_group = "nogroup"
+
+but you must remember to allow that user write
+permissions to /var/log/exim and /var/spool/exim
+
+If you intend replacing sendmail with exim, then don't
+forget to modify /etc/mail/mailer.conf accordingly.
+
diff --git a/mail/exim/pkg/PLIST b/mail/exim/pkg/PLIST
index 87959966212..8c6adb3deff 100644
--- a/mail/exim/pkg/PLIST
+++ b/mail/exim/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $OpenBSD: PLIST,v 1.5 2000/06/04 22:42:06 espie Exp $
 sbin/exim
 sbin/eximon
 sbin/eximon.bin
@@ -12,17 +13,17 @@ sbin/exigrep
 sbin/eximstats
 sbin/exiqsumm
 sbin/exim_lock
-@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
-@unexec install-info --delete %D/info/exim.info %D/info/dir
-@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
 info/exim_overview.info
 info/exim.info
 info/exim_filter.info
-@exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @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
+@unexec install-info --delete %D/info/exim_overview.info %D/info/dir
+@unexec install-info --delete %D/info/exim.info %D/info/dir
+@unexec install-info --delete %D/info/exim_filter.info %D/info/dir
+lib/exim/configure.sample
 @exec [ -d /etc/exim ] || mkdir /etc/exim
-@cwd /etc/exim
-configure.sample
-@exec [ -f %D/configure ] || install -m 644 %D/configure.sample %D/configure
+@exec [ -f /etc/exim/configure ] || install -m 644 %D/%F /etc/exim/configure
+@dirrm lib/exim
+@unexec echo "Please remove the /etc/exim directory manually"