diff --git a/misc/amanda/Makefile b/misc/amanda/Makefile
index ad7d839df59..3cb7a1aa5b5 100644
--- a/misc/amanda/Makefile
+++ b/misc/amanda/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.25 2004/09/24 08:43:19 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2004/11/29 09:53:46 alek Exp $
 
 COMMENT=	"network-capable tape backup (client and tape server)"
 COMMENT-client=	"network-capable tape backup (client only)"
@@ -7,7 +7,7 @@ DISTVERSION=	2.4.2p2
 
 # 2.4.2p2 is problematical as a package name, because we have been
 # marking OpenBSD package revisions with a "pX" suffix.
-PKGVERSION=	${DISTVERSION:S/p/./}
+PKGVERSION=	${DISTVERSION:S/p/./}p0
 
 DISTNAME=	amanda-${DISTVERSION}
 
@@ -25,6 +25,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
+WANTLIB=		c m readline termcap
 
 MASTER_SITES=	ftp://ftp.amanda.org/pub/amanda/ \
 		${MASTER_SITE_SOURCEFORGE:=amanda/}
diff --git a/misc/amanda/pkg/DEINSTALL b/misc/amanda/pkg/DEINSTALL
deleted file mode 100644
index 0b3fe96e052..00000000000
--- a/misc/amanda/pkg/DEINSTALL
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL,v 1.4 2004/09/24 08:43:19 espie Exp $
-#
-# de-installation of amanda
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-CONF_DIR=${SYSCONFDIR}/amanda
-
-if [ $# -ne 2 -o "$2" != "DEINSTALL" ]; then
-    echo "usage: $0 distname DEINSTALL" >&2
-    exit 1
-fi
-
-if grep -q -E ^amanda\|^amandaidx\|^amidxtape /etc/inetd.conf ; then
-   echo ""
-   echo "** Amanda should be removed from /etc/inetd.conf"
-fi
-
-exit 0
diff --git a/misc/amanda/pkg/DEINSTALL-client b/misc/amanda/pkg/DEINSTALL-client
deleted file mode 100644
index 73925ddcf5b..00000000000
--- a/misc/amanda/pkg/DEINSTALL-client
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-# $OpenBSD: DEINSTALL-client,v 1.2 2004/09/24 08:43:19 espie Exp $
-#
-# de-installation of amanda
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-if [ $# -ne 2 -o "$2" != "DEINSTALL" ]; then
-    echo "usage: $0 distname DEINSTALL" >&2
-    exit 1
-fi
-
-if grep -q -E ^amanda\|^amandaidx\|^amidxtape /etc/inetd.conf ; then
-   echo ""
-   echo "** Amanda should be removed from /etc/inetd.conf"
-fi
-
-exit 0
diff --git a/misc/amanda/pkg/UNMESSAGE b/misc/amanda/pkg/UNMESSAGE
new file mode 100644
index 00000000000..fedf94f90a7
--- /dev/null
+++ b/misc/amanda/pkg/UNMESSAGE
@@ -0,0 +1,2 @@
+Remove Amanda entries (amanda, amandaidx, amidxtape) from
+/etc/inetd.conf.
diff --git a/misc/amanda/pkg/UNMESSAGE-client b/misc/amanda/pkg/UNMESSAGE-client
new file mode 100644
index 00000000000..fedf94f90a7
--- /dev/null
+++ b/misc/amanda/pkg/UNMESSAGE-client
@@ -0,0 +1,2 @@
+Remove Amanda entries (amanda, amandaidx, amidxtape) from
+/etc/inetd.conf.