diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile
index f4e4cb7ff9b..a52da085bdc 100644
--- a/net/oidentd/Makefile
+++ b/net/oidentd/Makefile
@@ -1,7 +1,8 @@
-# $OpenBSD: Makefile,v 1.11 2003/09/25 06:25:13 jolan Exp $
+# $OpenBSD: Makefile,v 1.12 2004/12/05 03:09:45 alek Exp $
 
 COMMENT=	"ident daemon with custom responses and NAT support"
 DISTNAME=	oidentd-2.0.7
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=ojnk/}
 
@@ -12,6 +13,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c
 
 CONFIGURE_STYLE=gnu
 
diff --git a/net/oidentd/pkg/DEINSTALL b/net/oidentd/pkg/DEINSTALL
deleted file mode 100644
index ca5f4734748..00000000000
--- a/net/oidentd/pkg/DEINSTALL
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.5 2004/04/14 18:59:08 xsa Exp $
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONFFILE=${SYSCONFDIR}/oidentd.conf
-MASQFILE=${SYSCONFDIR}/oidentd_masq.conf
-
-if [ ${PKG_DELETE_EXTRA} != Yes -a \
-	\( -f ${CONFFILE} -o -f ${MASQFILE} \) ];
-then
-    echo
-    echo "+---------------"
-    echo "| To completely deinstall the $1 package you need to perform"
-    echo "| this step as root:"
-    echo "|"
-    echo "|         rm -f ${CONFFILE} ${MASQFILE}"
-    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/oidentd/pkg/MESSAGE b/net/oidentd/pkg/MESSAGE
index 229a4275042..0f73ea54bd3 100644
--- a/net/oidentd/pkg/MESSAGE
+++ b/net/oidentd/pkg/MESSAGE
@@ -1,7 +1,3 @@
-
-Installing Ojnk's Identd on OpenBSD
------------------------------------
-
 See oidentd(8), oidentd.conf(5), and oidentd_masq.conf(5) for
 information on configuring oidentd.
 
@@ -16,4 +12,3 @@ fi
 For inetd, modify /etc/inetd.conf to use oidentd for ident:
 
 ident	stream	tcp	nowait	root	${PREFIX}/sbin/oidentd oidentd -Im
-
diff --git a/net/oidentd/pkg/PLIST b/net/oidentd/pkg/PLIST
index 54ecc7d02a2..f38a46fed1a 100644
--- a/net/oidentd/pkg/PLIST
+++ b/net/oidentd/pkg/PLIST
@@ -1,8 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/09/15 18:17:42 espie Exp $
+@comment $OpenBSD: PLIST,v 1.5 2004/12/05 03:09:45 alek Exp $
 @man man/man5/oidentd.conf.5
 @man man/man5/oidentd_masq.conf.5
 @man man/man8/oidentd.8
 sbin/oidentd
-@cwd ${SYSCONFDIR}
-@extra oidentd.conf
-@extra oidentd_masq.conf
+@extra ${SYSCONFDIR}/oidentd.conf
+@extra ${SYSCONFDIR}/oidentd_masq.conf