diff --git a/german/unix-connect/Makefile b/german/unix-connect/Makefile
index 574623932d56..1895622b4f4b 100644
--- a/german/unix-connect/Makefile
+++ b/german/unix-connect/Makefile
@@ -1,43 +1,43 @@
 # New ports collection makefile for:    unix-connect
 # Date created:         01.May 1999
 # Whom:                 dirk.meyer@dinoex.sub.org
 #
 # $FreeBSD$
 #
 
 PORTNAME=	unix-connect
 PORTVERSION=	0.94
 CATEGORIES=	german comms news mail
 MASTER_SITES=	ftp://ftp.dinoex.org/pub/unix-connect/ \
 		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	dinoex@FreeBSD.org
 COMMENT=	Unix-Connect - mail+news-gateway for Zconnect (tm)
 
 BUILD_DEPENDS=	lrz:${PORTSDIR}/comms/lrzsz
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 #USE_GMAKE=     yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-user=news
 CONFIGURE_ARGS+=--with-group=dialer
 CONFIGURE_ARGS+=--with-execdir=${PREFIX}/libexec/uconnect
-CONFIGURE_ARGS+=--with-confdir=/etc/uconnect
+CONFIGURE_ARGS+=--with-confdir=${PREFIX}/etc/uconnect
 CONFIGURE_ARGS+=--with-spooldir=/var/spool/uconnect
 CONFIGURE_ARGS+=--with-mail=sendmail
 CONFIGURE_ARGS+=--with-news=cnews
 CONFIGURE_ARGS+=--enable-testing
 CFLAGS+=	-g
 CFLAGS:=	${CFLAGS:S/-O[0-9]*//g}	# gcc generates broken code in uwsmtp
 
 post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for i in README INSTALL TODO ChangeLog ChangeLog.configure
 	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}/
 .endfor
 	@${TAR} -C ${WRKSRC}/docs -cf - . | ${TAR} -C ${DOCSDIR} -xf -
 .endif
 
 .include <bsd.port.mk>
diff --git a/german/unix-connect/pkg-plist b/german/unix-connect/pkg-plist
index d463c4f54856..f19c779ab0c0 100644
--- a/german/unix-connect/pkg-plist
+++ b/german/unix-connect/pkg-plist
@@ -1,46 +1,72 @@
 libexec/uconnect/januslogin
 libexec/uconnect/receiver
 libexec/uconnect/zcall
 libexec/uconnect/uuwnews
 libexec/uconnect/uuwsmtp
 libexec/uconnect/uursmtp
 libexec/uconnect/zconsplit
 libexec/uconnect/anruf
 libexec/uconnect/auspack
 libexec/uconnect/einpack
 libexec/uconnect/import
 libexec/uconnect/list-systems
 libexec/uconnect/prearc
 libexec/uconnect/uumlist
 libexec/uconnect/bsmtp
 libexec/uconnect/rcsmtp
 libexec/uconnect/rgsmtp
 libexec/uconnect/rsmtp
 libexec/uconnect/cron.d.hourly
 libexec/uconnect/logrotate.d.entry
 libexec/uconnect/mail.uuconnect
 libexec/uconnect/uurnews
 libexec/uconnect/zbatchsmtp
 @dirrm libexec/uconnect
+etc/uconnect/alias
+etc/uconnect/approved
+etc/uconnect/autoeintrag.zconnect
+etc/uconnect/config
+etc/uconnect/myself.zconnect
+etc/uconnect/systems.sample
+etc/uconnect/xprogs
+etc/uconnect/zconnecthosts
+@dirrm etc/uconnect/systems
+@dirrm etc/uconnect
+@exec mkdir /var/spool/uconnect
+@exec mkdir /var/spool/uconnect/backin
+@exec mkdir /var/spool/uconnect/backout
+@exec mkdir /var/spool/uconnect/error
+@exec mkdir /var/spool/uconnect/locks
+@exec mkdir /var/spool/uconnect/logfiles
+@exec mkdir /var/spool/uconnect/netcall
+@exec mkdir /var/spool/uconnect/rsmtp
+@unexec rmdir /var/spool/uconnect/backin
+@unexec rmdir /var/spool/uconnect/backout
+@unexec rmdir /var/spool/uconnect/error
+@unexec rmdir /var/spool/uconnect/locks
+@unexec rmdir /var/spool/uconnect/logfiles
+@unexec rmdir /var/spool/uconnect/netcall
+@unexec rmdir /var/spool/uconnect/rsmtp
+@unexec rmdir /var/spool/uconnect
 %%PORTDOCS%%share/doc/unix-connect/ChangeLog
 %%PORTDOCS%%share/doc/unix-connect/ChangeLog.configure
 %%PORTDOCS%%share/doc/unix-connect/INSTALL
 %%PORTDOCS%%share/doc/unix-connect/INSTALL.OLD
 %%PORTDOCS%%share/doc/unix-connect/POLICY
 %%PORTDOCS%%share/doc/unix-connect/PROBLEMS
 %%PORTDOCS%%share/doc/unix-connect/README
 %%PORTDOCS%%share/doc/unix-connect/README.systeme
 %%PORTDOCS%%share/doc/unix-connect/THANX
 %%PORTDOCS%%share/doc/unix-connect/TODO
 %%PORTDOCS%%share/doc/unix-connect/bnews.patch
 %%PORTDOCS%%share/doc/unix-connect/changes.doc
 %%PORTDOCS%%share/doc/unix-connect/ger-texinfo.tex
 %%PORTDOCS%%share/doc/unix-connect/iso8859-1.tex
 %%PORTDOCS%%share/doc/unix-connect/lizenz.deutsch
 %%PORTDOCS%%share/doc/unix-connect/texinfo.tex
 %%PORTDOCS%%share/doc/unix-connect/unix-connect.dvi
 %%PORTDOCS%%share/doc/unix-connect/unix-connect.texinfo
 %%PORTDOCS%%share/doc/unix-connect/xpoint.dok
 %%PORTDOCS%%share/doc/unix-connect/zcon31.changes
 %%PORTDOCS%%share/doc/unix-connect/zconnect.doc
 %%PORTDOCS%%@dirrm share/doc/unix-connect