diff --git a/net/ytalk/Makefile b/net/ytalk/Makefile
index dfa2db848d9..0d9a927bd2d 100644
--- a/net/ytalk/Makefile
+++ b/net/ytalk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2000/08/16 16:34:17 naddy Exp $
+# $OpenBSD: Makefile,v 1.16 2000/08/16 17:02:29 brad Exp $
 
 DISTNAME=	ytalk-3.1.1
 CATEGORIES=	net
@@ -14,20 +14,20 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-FLAVORS= no_x11
+FLAVORS=	no_x11
 FLAVOR?=
 
-# No gnu-configure for now, need to set up DESTDIR in prefix/etc for fake
-# to work.
-CONFIGURE_STYLE=gnu dest
+SUBST_VARS=	SYSCONFDIR
+
+CONFIGURE_STYLE= gnu dest
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x
 .endif
-SUBST_VARS=	SYSCONFDIR
 
 INSTALL_TARGET=	install.bin install.man
 
 post-install:
-	${INSTALL_DATA} ${WRKBUILD}/ytalkrc ${PREFIX}/share/examples/ytalkrc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ytalk
+	${INSTALL_DATA} ${WRKBUILD}/ytalkrc ${PREFIX}/share/examples/ytalk/ytalkrc-sample
 
 .include <bsd.port.mk>
diff --git a/net/ytalk/pkg/DEINSTALL b/net/ytalk/pkg/DEINSTALL
index 160a1c09630..998bec4b93b 100644
--- a/net/ytalk/pkg/DEINSTALL
+++ b/net/ytalk/pkg/DEINSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.3 2000/08/16 16:34:19 naddy Exp $
+# $OpenBSD: DEINSTALL,v 1.4 2000/08/16 17:02:30 brad Exp $
 #
 # ytalk de-installation
 
@@ -8,13 +8,13 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/ytalkrc
 
-if [ -f ${CONFIG_FILE} ]; then
+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 "|           rm -f $CONFIG_FILE"
     echo "|"
     echo "| Do not do this if you plan on re-installing $1"
     echo "| at some future time."
diff --git a/net/ytalk/pkg/INSTALL b/net/ytalk/pkg/INSTALL
index 809ddd620b8..b47bb0cd506 100644
--- a/net/ytalk/pkg/INSTALL
+++ b/net/ytalk/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.3 2000/08/16 16:34:19 naddy Exp $
+# $OpenBSD: INSTALL,v 1.4 2000/08/16 17:02:31 brad Exp $
 #
 # Pre/post-installation setup of ytalk
 
@@ -9,30 +9,26 @@ set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
 CONFIG_FILE=${SYSCONFDIR}/ytalkrc
-SAMPLE_CONFIG_FILE=$PREFIX/share/examples/ytalkrc
+SAMPLE_CONFIG_FILE=$PREFIX/share/examples/ytalk/ytalkrc-sample
 
-# 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 "| The existing $1 configuration file, $CONFIG_FILE,"
     echo "| has NOT been changed.  You may want to compare it to the"
-    echo "| current sample file, ${SAMPLE_CONFIG_FILE},"
+    echo "| current sample file, $SAMPLE_CONFIG_FILE,"
     echo "| and update your configuration as needed."
     echo "+---------------"
     echo
 }
 
-# Function: install the system ytalkrc from the sample
-#
 do_install()
 {
-    install -o root -g wheel -m 644 ${SAMPLE_CONFIG_FILE} ${CONFIG_FILE}
+    install -o root -g wheel -m 644 $SAMPLE_CONFIG_FILE $CONFIG_FILE
     echo
     echo "+---------------"
-    echo "| The $1 configuration file, ${CONFIG_FILE},"
+    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 "+---------------"
diff --git a/net/ytalk/pkg/PLIST b/net/ytalk/pkg/PLIST
index 23478cb3771..51f6e621f39 100644
--- a/net/ytalk/pkg/PLIST
+++ b/net/ytalk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2000/08/16 16:34:19 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2000/08/16 17:02:31 brad Exp $
 bin/ytalk
 man/man1/ytalk.1
-share/examples/ytalkrc
+share/examples/ytalk/ytalkrc-sample