diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index a0622f81fc0..cd9854f130c 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,21 +1,20 @@
-# $OpenBSD: Makefile,v 1.3 1999/03/16 23:38:35 espie Exp $
+# $OpenBSD: Makefile,v 1.4 1999/04/22 15:26:59 brad Exp $
 
 DISTNAME=	ytalk-3.1
 CATEGORIES=	net
+MASTER_SITES=	http://www.eleves.ens.fr:8080/home/espel/ytalk/
 
-MASTER_SITES=http://www.eleves.ens.fr:8080/home/espel/ytalk/	
+NEED_VERSION=	1.79
 
 MAINTAINER=	espie@cvs.openbsd.org
 
-GNU_CONFIGURE=yes
+GNU_CONFIGURE=	yes
 
-NEED_VERSION=1.79
-
-# No SEPARATE_BUILD
-
-INSTALL_TARGET=install.bin install.man
+INSTALL_TARGET=	install.bin install.man
 
 post-install:
-	${INSTALL_DATA} ${WRKBUILD}/ytalkrc	${PREFIX}/share/ytalkrc.sample
+	${MKDIR} ${PREFIX}/lib/ytalk
+	${INSTALL_DATA} ${WRKBUILD}/ytalkrc ${PREFIX}/lib/ytalk/ytalkrc.sample
+	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGDIR}/INSTALL ${DISTNAME} POST-INSTALL
 
 .include <bsd.port.mk>
diff --git a/net/ytalk/pkg/DEINSTALL b/net/ytalk/pkg/DEINSTALL
new file mode 100644
index 00000000000..e712985ee92
--- /dev/null
+++ b/net/ytalk/pkg/DEINSTALL
@@ -0,0 +1,24 @@
+# $OpenBSD: DEINSTALL,v 1.1 1999/04/22 15:26:59 brad Exp $
+#
+# ytalk de-installation
+
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=/etc/ytalkrc
+
+if [ -f ${CONFIG_FILE} ]; then
+    echo
+    echo "+---------------"
+    echo "| To completely deinstall the $1 package you need to perform"
+    echo "| this step as root:"
+    echo "|"
+    echo "|           rm -f ${CONFIG_FILE}"
+    echo "|"
+    echo "| Do not do this if you plan on re-installing $1"
+    echo "| at some future time."
+    echo "+---------------"
+    echo
+fi
+
+exit 0
diff --git a/net/ytalk/pkg/INSTALL b/net/ytalk/pkg/INSTALL
new file mode 100644
index 00000000000..2427c58e8bc
--- /dev/null
+++ b/net/ytalk/pkg/INSTALL
@@ -0,0 +1,68 @@
+#!/bin/sh
+# $OpenBSD: INSTALL,v 1.1 1999/04/22 15:26:59 brad Exp $
+#
+# Pre/post-installation setup of ytalk
+
+# exit on errors, use a sane path and install prefix
+#
+set -e
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+PREFIX=${PKG_PREFIX:-/usr/local}
+CONFIG_FILE=/etc/ytalkrc
+
+# Function: tell the user what s/he needs to do to use the port just installed
+#
+do_notice()
+{
+    echo
+    echo "+---------------"
+    echo "| The existing $1 configuration file, ${CONFIG_FILE},"
+    echo "| has NOT been changed.  You may want to compare it to the"
+    echo "| current sample file, ${PREFIX}/lib/ytalk/ytalkrc.sample,"
+    echo "| and update your configuration as needed."
+    echo "+---------------"
+    echo
+}
+
+# Function: install the system ytalkrc from the sample
+#
+do_install()
+{
+    cp ${PREFIX}/lib/ytalk/ytalkrc.sample ${CONFIG_FILE}
+    echo
+    echo "+---------------"
+    echo "| The $1 configuration file, ${CONFIG_FILE},"
+    echo "| has been installed.  Please view this file and change"
+    echo "| the configuration to meet your needs"
+    echo "+---------------"
+    echo
+
+}
+
+# verify proper execution
+#
+if [ $# -ne 2 ]; then
+    echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+    exit 1
+fi
+
+# Verify/process the command
+#
+case $2 in
+    PRE-INSTALL)
+	: nothing to pre-install for this port
+	;;
+    POST-INSTALL)
+	if [ -f $CONFIG_FILE ]; then
+	    do_notice $1
+	else
+	    do_install $1
+	fi
+	;;
+    *)
+	echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
+	exit 1
+	;;
+esac
+
+exit 0
diff --git a/net/ytalk/pkg/MESSAGE b/net/ytalk/pkg/MESSAGE
deleted file mode 100644
index f8a68af5625..00000000000
--- a/net/ytalk/pkg/MESSAGE
+++ /dev/null
@@ -1,4 +0,0 @@
-ytalk works better with an /etc/ytalkrc configuration file.
-You can customize yours by basing yourself on
-${PREFIX}/share/ytalkrc.sample and the man page.
-
diff --git a/net/ytalk/pkg/PLIST b/net/ytalk/pkg/PLIST
index 00d9057ed8a..bd175ea5c43 100644
--- a/net/ytalk/pkg/PLIST
+++ b/net/ytalk/pkg/PLIST
@@ -1,3 +1,4 @@
 bin/ytalk
 man/man1/ytalk.1
-share/ytalkrc.sample
+lib/ytalk/ytalkrc.sample
+@dirrm lib/ytalk