diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index f6cc5fbfca4d..362d0c06fd71 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,56 +1,54 @@
 # New ports collection makefile for: 	xmp
 # Date created:		18 September 1999
 # Whom:			Anders Nordby <anders@fix.no>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xmp
 PORTVERSION=	2.0.4
 PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	anders@FreeBSD.org
 COMMENT=	A player for many different Amiga and PC module formats
 
-BROKEN=		Incomplete pkg-plist
-
 USE_BZIP2=	yes
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_AUTOCONF_VER=	213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--disable-alsa
 
 CFLAGS+=	-fPIC
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha"
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--disable-oss --enable-esd
 PKGNAMESUFFIX=	-esound
 .elif ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-esd
 PKGNAMESUFFIX=	-esound
 .endif
 
 .if !defined(WITHOUT_XMMS)
   LIB_DEPENDS+=   xmms.4:${PORTSDIR}/multimedia/xmms
 .else
   CONFIGURE_ARGS+= --disable-xmms
 .endif
 
 MAN1=		xmp.1
 MLINKS=		xmp.1 xxmp.1
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
 
 .include <bsd.port.post.mk>
diff --git a/audio/xmp/pkg-plist b/audio/xmp/pkg-plist
index 87f5abce8a4b..bf4a22e27acb 100644
--- a/audio/xmp/pkg-plist
+++ b/audio/xmp/pkg-plist
@@ -1,4 +1,5 @@
 bin/xmp
 bin/xxmp
 etc/xmp.conf
 etc/xmp-modules.conf
+@unexec rm %D/lib/xmms/Input/xmp-plugin.so 2>/dev/null || true