diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile
index f985e7cef004..4896624fcbbe 100644
--- a/multimedia/xfce4-xmms-plugin/Makefile
+++ b/multimedia/xfce4-xmms-plugin/Makefile
@@ -1,47 +1,45 @@
-# New ports collection makefile for:	xfce4-xmms-plugin
-# Date created:				2004/05/10
-# Whom:					Zahemszky, Gábor <Gabor@Zahemszky.HU>
-#
+# Created by: Zahemszky, Gábor <Gabor@Zahemszky.HU>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-xmms-plugin
 PORTVERSION=	0.5.3
 PORTREVISION=	3
 CATEGORIES=	multimedia audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce4 XMMS control plugin for xfce4-panel
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack pango pkgconfig
 USE_XFCE=	configenv libgui libutil panel
 
-OPTIONS=	XMMS		"Enable xmms support"			on \
-		BEEP		"Enable beep-media-player support" 	off \
-		AUDACIOUS	"Enable audacious support"		off
+OPTIONS_DEFINE=	XMMS BEEP AUDACIOUS
+OPTIONS_DEFAULT=	XMMS
+XMMS_DESC=	xmms support
+BEEP_DESC=	beep-media-player support
+AUDACIOUS_DESC=	audacious support
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_BEEP)
+.if ${PORT_OPTIONS:MBEEP}
 RUN_DEPENDS+=	beep-media-player:${PORTSDIR}/multimedia/beep-media-player
 .endif
 
-.if defined(WITH_XMMS)
+.if ${PORT_OPTIONS:MXMSS}
 RUN_DEPENDS+=	xmms:${PORTSDIR}/multimedia/xmms
 .endif
 
-.if defined(WITH_AUDACIOUS)
+.if ${PORT_OPTIONS:MAUDACIOUS}
 RUN_DEPENDS+=	audacious2:${PORTSDIR}/multimedia/audacious
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|== x|= x|g' ${WRKSRC}/configure
 
 .include <bsd.port.post.mk>