diff --git a/www/tinyproxy/Makefile b/www/tinyproxy/Makefile
index c9aea50d48a..4859b6b27bf 100644
--- a/www/tinyproxy/Makefile
+++ b/www/tinyproxy/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2002/08/12 22:49:34 couderc Exp $
+# $OpenBSD: Makefile,v 1.2 2002/08/27 02:53:29 brad Exp $
 
 COMMENT=		"lightweight HTTP/SSL proxy"
 CATEGORIES=		www
@@ -17,9 +17,11 @@ PERMIT_DISTFILES_FTP=	Yes
 
 CONFIGURE_STYLE=	simple
 
-SYSCONFDIR=		/etc/tinyproxy
+TP_CONFIG=		${SYSCONFDIR}/tinyproxy
 
-CONFIGURE_ARGS+=	--with-config=${SYSCONFDIR}/tinyproxy.conf
+CONFIGURE_ARGS+=	--with-config=${TP_CONFIG}/tinyproxy.conf
+
+SUBST_VARS=		TP_CONFIG
 
 DOCS=			HTTP_ERROR_CODES RFC_INFO
 
diff --git a/www/tinyproxy/pkg/DEINSTALL b/www/tinyproxy/pkg/DEINSTALL
index 8d54a5c7937..4e85f9a4ea6 100644
--- a/www/tinyproxy/pkg/DEINSTALL
+++ b/www/tinyproxy/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1.1.1 2002/08/12 22:49:34 couderc Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2002/08/27 02:53:29 brad Exp $
 #
 # tinyproxy de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${TP_CONFIG}
 
 if [ -d $CONFIG_DIR ]; then 
 	echo
diff --git a/www/tinyproxy/pkg/DESCR b/www/tinyproxy/pkg/DESCR
index 1dc016df6d8..13254b64f46 100644
--- a/www/tinyproxy/pkg/DESCR
+++ b/www/tinyproxy/pkg/DESCR
@@ -1,7 +1,8 @@
-tinyproxy is a GPLed, lightweight HTTP/SSL proxy. Designed from the ground
-up to be fast and yet small, it is an ideal solution for sites where a
-full-featured HTTP proxy is required, but the system resources required to
-run a more demanding HTTP proxy are unavailable. tinyproxy is fully compatible
-with all existing web browsers, and has a number of useful features.
+tinyproxy is a GPLed, lightweight HTTP/SSL proxy. Designed from the
+ground up to be fast and yet small, it is an ideal solution for
+sites where a full-featured HTTP proxy is required, but the system
+resources required to run a more demanding HTTP proxy are unavailable.
+tinyproxy is fully compatible with all existing web browsers, and
+has a number of useful features.
 
 WWW: ${HOMEPAGE}
diff --git a/www/tinyproxy/pkg/INSTALL b/www/tinyproxy/pkg/INSTALL
index 7e5169cac27..9558f2b3b19 100644
--- a/www/tinyproxy/pkg/INSTALL
+++ b/www/tinyproxy/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.1.1.1 2002/08/12 22:49:34 couderc Exp $
+# $OpenBSD: INSTALL,v 1.2 2002/08/27 02:53:29 brad Exp $
 #
 # Pre/post-installation setup of tinyproxy
 
@@ -8,7 +8,7 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}
+CONFIG_DIR=${TP_CONFIG}
 SAMPLE_CONFIG_DIR=$PREFIX/share/examples/tinyproxy
 
 do_notice()