diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index 13187a6c9ad7..01c1a71ebd47 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -10,12 +10,17 @@ MASTER_SITES=	http://newsbeuter.org/downloads/
 MAINTAINER=	arved@FreeBSD.org
 COMMENT=	An RSS feed reader for the text console
 
-LIB_DEPENDS=	stfl.1:${PORTSDIR}/devel/stfl \
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	stfl:${PORTSDIR}/devel/stfl \
 		curl:${PORTSDIR}/ftp/curl \
 		libjson.so:${PORTSDIR}/devel/json-c
 
-LICENSE=	MIT
-LICENSE_FILE=	${WRKSRC}/LICENSE
+OPTIONS_DEFINE= PODCAST
+PODCAST_DESC=	Podcast client (podbeuter)
+
+OPTIONS_DEFAULT= PODCAST
 
 USES=		gettext iconv ncurses gmake pkgconfig perl5
 USE_PERL5=	build
@@ -23,9 +28,13 @@ USE_SQLITE=	yes
 USE_GNOME=	libxml2
 USE_GCC=	any
 
-MAN1=	newsbeuter.1 podbeuter.1
+.include  <bsd.port.options.mk>
 
-NO_STAGE=	yes
+.if ${PORT_OPTIONS:MPODCAST}
+PLIST_SUB+=	PODCAST=""
+.else
+PLIST_SUB+=	PODCAST="@comment "
+.endif
 
 post-patch:
 	${REINPLACE_CMD} -e "s,share/man,man,; \
diff --git a/www/newsbeuter/pkg-descr b/www/newsbeuter/pkg-descr
index 9578bc32a10d..67ccae8ee426 100644
--- a/www/newsbeuter/pkg-descr
+++ b/www/newsbeuter/pkg-descr
@@ -1,4 +1,4 @@
 Newsbeuter is an RSS feed reader for the text console.
 
 Author:	Andreas Krennmair
-WWW:	http://newsbeuter.org/
+WWW: http://newsbeuter.org/
diff --git a/www/newsbeuter/pkg-plist b/www/newsbeuter/pkg-plist
index ce9572753a37..5367af011054 100644
--- a/www/newsbeuter/pkg-plist
+++ b/www/newsbeuter/pkg-plist
@@ -1,5 +1,5 @@
 bin/newsbeuter
-bin/podbeuter
+%%PODCAST%%bin/podbeuter
 share/locale/de/LC_MESSAGES/newsbeuter.mo
 share/locale/es/LC_MESSAGES/newsbeuter.mo
 share/locale/es_ES/LC_MESSAGES/newsbeuter.mo
@@ -19,5 +19,7 @@ share/locale/zh_TW/LC_MESSAGES/newsbeuter.mo
 share/doc/newsbeuter/docbook-xsl.css
 share/doc/newsbeuter/newsbeuter.html
 share/doc/newsbeuter/examples/config
+man/man1/newsbeuter.1.gz
+%%PODCAST%%man/man1/podbeuter.1.gz
 @dirrm share/doc/newsbeuter/examples
 @dirrm share/doc/newsbeuter