diff --git a/audio/herrie/Makefile b/audio/herrie/Makefile
index 73831608229b..71b40a179081 100644
--- a/audio/herrie/Makefile
+++ b/audio/herrie/Makefile
@@ -9,77 +9,41 @@ MASTER_SITES=	http://herrie.info/distfiles/ \
 		http://www.stack.nl/~ed/projects/herrie/distfiles/
 
 MAINTAINER=	ed@FreeBSD.org
-COMMENT=	A small command line interface music player
+COMMENT=	Small command line interface music player
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=verbose
 CONFIGURE_ENV+=	PREFIX=${PREFIX}
 
-USE_BZIP2=	yes
-NO_STAGE=	yes
+USES=		tar:bzip2
 USE_GNOME=	glib20
 
-OPTIONS_DEFINE=	MAD VORBIS SNDFILE MODPLUG HTTP LIBAO XCURSES XSPF
+OPTIONS_DEFINE=	MAD VORBIS SNDFILE MODPLUG HTTP LIBAO XCURSES XSPF NLS
 OPTIONS_DEFAULT=	MAD VORBIS HTTP XSPF
+OPTIONS_SUB=	yes
 
 HTTP_DESC=	HTTP streams and AudioScrobbler support
 LIBAO_DESC=	LibAO support (breaks chroot)
 XCURSES_DESC=	Build XCurses version
 
-MAN1=		herrie.1
-MANCOMPRESSED=	yes
-
-.include <bsd.port.options.mk>
-
-.if ${OSVERSION} < 700033
-CONFIGURE_ARGS+=ncurses
-.endif
-
-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	libmad.so:${PORTSDIR}/audio/mad \
-		libid3tag.so:${PORTSDIR}/audio/libid3tag
-.else
-CONFIGURE_ARGS+=no_mp3
-.endif
-.if ${PORT_OPTIONS:MVORBIS}
-LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-.else
-CONFIGURE_ARGS+=no_vorbis
-.endif
-.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	libsndfile.so:${PORTSDIR}/audio/libsndfile
-.else
-CONFIGURE_ARGS+=no_sndfile
-.endif
-.if ${PORT_OPTIONS:MMODPLUG}
-LIB_DEPENDS+=	libmodplug.so:${PORTSDIR}/audio/libmodplug
-.else
-CONFIGURE_ARGS+=no_modplug
-.endif
-.if ${PORT_OPTIONS:MHTTP}
-LIB_DEPENDS+=	libbcurl.so:${PORTSDIR}/ftp/curl
-.else
-CONFIGURE_ARGS+=no_http no_scrobbler
-.endif
-.if ${PORT_OPTIONS:MLIBAO}
-LIB_DEPENDS+=	libao.so:${PORTSDIR}/audio/libao
-CONFIGURE_ARGS+=ao
-.endif
-.if ${PORT_OPTIONS:MXCURSES}
-LIB_DEPENDS+=	libXCurses.so:${PORTSDIR}/devel/pdcurses
-CONFIGURE_ARGS+=xcurses
-.endif
-.if ${PORT_OPTIONS:MXSPF}
-LIB_DEPENDS+=	libxspf.so:${PORTSDIR}/multimedia/libxspf
-.else
-CONFIGURE_ARGS+=no_xspf
-.endif
-.if ${PORT_OPTIONS:MNLS}
-PLIST_SUB+=	NLS=""
-USES+=		gettext
-.else
-PLIST_SUB+=	NLS="@comment "
-CONFIGURE_ARGS+=no_nls
-.endif
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/mad \
+			libid3tag.so:${PORTSDIR}/audio/libid3tag
+MAD_CONFIGURE_OFF=no_mp3
+VORBIS_LIB_DEPENDS=	libvorbis.so:${PORTSDIR}/audio/libvorbis
+VORBIS_CONFIGURE_OFF=no_vorbis
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CONFIGURE_OFF=no_sndfile
+MODPLUG_LIB_DEPENDS=	libmodplug.so:${PORTSDIR}/audio/libmodplug
+MODPLUG_CONFIGURE_OFF=no_modplug
+HTTP_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
+HTTP_CONFIGURE_OFF=no_http no_scrobbler
+LIBAO_LIB_DEPENDS=	libao.so:${PORTSDIR}/audio/libao
+LIBAO_CONFIGURE_ON=ao
+XCURSES_LIB_DEPENDS=	libXCurses.so:${PORTSDIR}/devel/pdcurses
+XCURSES_CONFIGURE_ON=xcurses
+XSPF_LIB_DEPENDS=	libxspf.so:${PORTSDIR}/multimedia/libxspf
+XSPF_CONFIGURE_OFF=no_xspf
+NLS_USES=	gettext
+NLS_CONFIGURE_OFF=no_nls
 
 .include <bsd.port.mk>
diff --git a/audio/herrie/pkg-plist b/audio/herrie/pkg-plist
index 7570abc19e35..2ecea593021c 100644
--- a/audio/herrie/pkg-plist
+++ b/audio/herrie/pkg-plist
@@ -1,5 +1,6 @@
 bin/herrie
 etc/herrie.conf.sample
+man/man1/herrie.1.gz
 %%NLS%%share/locale/ca/LC_MESSAGES/herrie.mo
 %%NLS%%share/locale/da/LC_MESSAGES/herrie.mo
 %%NLS%%share/locale/de/LC_MESSAGES/herrie.mo