diff --git a/www/mod_mp3/Makefile b/www/mod_mp3/Makefile
index 18a49b2ba30..51982950c5e 100644
--- a/www/mod_mp3/Makefile
+++ b/www/mod_mp3/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2004/12/11 13:29:21 alek Exp $
+# $OpenBSD: Makefile,v 1.6 2005/01/26 00:08:45 alek Exp $
 
 COMMENT=	"turns Apache into an MP3 or Ogg streaming server"
 
@@ -7,6 +7,7 @@ COMMENT=	"turns Apache into an MP3 or Ogg streaming server"
 NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
 
 DISTNAME=	mod_mp3-0.39
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	www audio
 MASTER_SITES=	http://software.tangent.org/download/ \
 		ftp://ftp.tangent.org/pub/apache/
diff --git a/www/mod_mp3/pkg/DEINSTALL b/www/mod_mp3/pkg/DEINSTALL
deleted file mode 100644
index 4309b9838f8..00000000000
--- a/www/mod_mp3/pkg/DEINSTALL
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: DEINSTALL,v 1.2 2003/07/19 22:41:25 naddy Exp $
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-PREFIX=${PKG_PREFIX:-/usr/local}
-CONF=`apxs -q SYSCONFDIR`/httpd.conf
-MODULE=/usr/lib/apache/modules/mod_mp3.so
-
-rm -f ${MODULE}
-
-echo
-echo "+---------------"
-echo "| To completely deinstall the $1 package you"
-echo "| need to perform these steps as root:"
-echo "|"
-echo "|		edit ${CONF}"
-echo "|		remove the line: LoadModule mp3_module"
-echo "|"
-echo "| Do not do this if you plan on re-installing the $1"
-echo "| package at some future time."
-echo "+---------------"
-echo
-
-exit 0
diff --git a/www/mod_mp3/pkg/PLIST b/www/mod_mp3/pkg/PLIST
index f8c6c3b3bde..90d3a6b61a0 100644
--- a/www/mod_mp3/pkg/PLIST
+++ b/www/mod_mp3/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:49:50 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/01/26 00:08:45 alek Exp $
 lib/mod_mp3.so
 sbin/mod_mp3-enable
 share/doc/mod_mp3/
@@ -7,3 +7,4 @@ share/examples/mod_mp3/
 share/examples/mod_mp3/mp3.conf
 %%mysql%%
 %%postgresql%%
+@unexec rm -f /usr/lib/apache/modules/mod_mp3.so
diff --git a/www/mod_mp3/pkg/UNMESSAGE b/www/mod_mp3/pkg/UNMESSAGE
new file mode 100644
index 00000000000..08e540b4562
--- /dev/null
+++ b/www/mod_mp3/pkg/UNMESSAGE
@@ -0,0 +1,8 @@
+To completely deinstall the mod_mp3 package you
+need to perform these steps as root:
+
+        edit /var/www/conf/httpd.conf
+        remove the line: LoadModule mp3_module
+
+Do not do this if you plan on re-installing the mod_mp3
+package at some future time.