diff --git a/graphics/gii/Makefile b/graphics/gii/Makefile
index 5627efff4ed..0e690c7189c 100644
--- a/graphics/gii/Makefile
+++ b/graphics/gii/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2002/12/28 19:10:50 todd Exp $
+# $OpenBSD: Makefile,v 1.23 2003/10/30 16:51:58 todd Exp $
 # Uses pthreads
 
 COMMENT=	"General Input Library (used by libggi)"
@@ -23,6 +23,9 @@ CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static --enable-mutexes="int"
 
+CONFDIR=	${SYSCONFDIR}/ggi
+SUBST_VARS=	CONFDIR
+
 DOCS=	README
 
 post-install:
diff --git a/graphics/gii/pkg/DEINSTALL b/graphics/gii/pkg/DEINSTALL
index 608145ea9d8..864fb266af7 100644
--- a/graphics/gii/pkg/DEINSTALL
+++ b/graphics/gii/pkg/DEINSTALL
@@ -1,12 +1,12 @@
 #!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.1 2000/09/23 23:55:52 brad Exp $
+# $OpenBSD: DEINSTALL,v 1.2 2003/10/30 16:51:58 todd Exp $
 #
 # gii de-installation
 
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/ggi
+CONFIG_DIR=${CONFDIR}
 
 if [ -d $CONFIG_DIR ]; then
     echo
diff --git a/graphics/gii/pkg/DESCR b/graphics/gii/pkg/DESCR
index 9b903aadc1c..5628fc57d32 100644
--- a/graphics/gii/pkg/DESCR
+++ b/graphics/gii/pkg/DESCR
@@ -11,5 +11,3 @@ library for your non-LibGGI applications. Also you might be interrested in
 the mhub utility found in the demos directory. mhub is a mouse event repeater
 and converter. See mhub(1) and the files doc/env.txt and doc/input.txt for
 more info.
-
-WWW: ${HOMEPAGE}
diff --git a/graphics/gii/pkg/INSTALL b/graphics/gii/pkg/INSTALL
index 333a16948d2..a3f5dba8d95 100644
--- a/graphics/gii/pkg/INSTALL
+++ b/graphics/gii/pkg/INSTALL
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $OpenBSD: INSTALL,v 1.2 2002/04/26 03:35:34 pvalchev Exp $
+# $OpenBSD: INSTALL,v 1.3 2003/10/30 16:51:58 todd Exp $
 #
 # Pre/post-installation setup of gii
 
@@ -8,8 +8,8 @@
 set -e
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 PREFIX=${PKG_PREFIX:-/usr/local}
-CONFIG_DIR=${SYSCONFDIR}/ggi
-CONFIG_FILE=$CONFIG_DIR/libgii.conf
+CONFIG_DIR=${CONFDIR}
+CONFIG_FILE=${CONFDIR}/libgii.conf
 SAMPLE_CONFIG_FILE=$PREFIX/share/examples/gii/libgii.conf.example
 
 do_notice()
diff --git a/graphics/gii/pkg/PLIST b/graphics/gii/pkg/PLIST
index 5897a948f51..7b1cbe33cd4 100644
--- a/graphics/gii/pkg/PLIST
+++ b/graphics/gii/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.9 2002/12/28 19:10:50 todd Exp $
+@comment $OpenBSD: PLIST,v 1.10 2003/10/30 16:51:58 todd Exp $
 bin/mhub
 bin/xsendbut
 include/ggi/errors.h
@@ -100,3 +100,4 @@ share/examples/gii/libgii.conf.example
 @dirrm include/ggi/internal
 @dirrm include/ggi/input
 @dirrm include/ggi
+@extraunexec rm -rf ${CONFDIR}