diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index 262a5e4a4c6f..6eda9c06dd1c 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -2,98 +2,63 @@
 # $FreeBSD$
 
 PORTNAME=	gtk-youtube-viewer
-PORTVERSION=	3.0.9
-PORTREVISION=	1
+PORTVERSION=	3.1.1
 CATEGORIES=	multimedia perl5
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK Search and play YouTube videos streaming in MPlayer
 
-LICENSE=	ART20 GPLv3
+LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 # According to Build.PL
-BUILD_DEPENDS=	p5-Test-More-UTF8>=0:${PORTSDIR}/devel/p5-Test-More-UTF8 \
-		p5-Scalar-List-Utils>=0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
-		p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64 \
-		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-File-Temp>=0:${PORTSDIR}/devel/p5-File-Temp \
-		p5-Text-CharWidth>=0:${PORTSDIR}/textproc/p5-Text-CharWidth \
-		p5-threads>=0:${PORTSDIR}/devel/p5-threads \
-		p5-Thread-Queue>=0:${PORTSDIR}/devel/p5-Thread-Queue \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast \
-		p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-PathTools>=0:${PORTSDIR}/devel/p5-PathTools \
-		p5-File-Path>=0:${PORTSDIR}/devel/p5-File-Path \
-		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
-		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
-		p5-Term-UI>=0:${PORTSDIR}/devel/p5-Term-UI \
-		p5-Text-ParseWords>=0:${PORTSDIR}/textproc/p5-Text-ParseWords \
-		p5-Text-Tabs+Wrap>=0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap  \
-		p5-Socket>=0:${PORTSDIR}/net/p5-Socket
+BUILD_DEPENDS=	p5-MIME-Base64>0:${PORTSDIR}/converters/p5-MIME-Base64 \
+		p5-Data-Dump>0:${PORTSDIR}/devel/p5-Data-Dump \
+		p5-File-Path>0:${PORTSDIR}/devel/p5-File-Path \
+		p5-File-Temp>0:${PORTSDIR}/devel/p5-File-Temp \
+		p5-Getopt-Long>0:${PORTSDIR}/devel/p5-Getopt-Long \
+		p5-PathTools>0:${PORTSDIR}/devel/p5-PathTools \
+		p5-ReadLine-Gnu>0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+		p5-Term-ANSIColor>0:${PORTSDIR}/devel/p5-Term-ANSIColor \
+		p5-Test-More-UTF8>0:${PORTSDIR}/devel/p5-Test-More-UTF8 \
+		p5-Thread-Queue>0:${PORTSDIR}/devel/p5-Thread-Queue \
+		p5-threads>0:${PORTSDIR}/devel/p5-threads \
+		p5-Scalar-List-Utils>0:${PORTSDIR}/lang/p5-Scalar-List-Utils \
+		p5-Socket>0:${PORTSDIR}/net/p5-Socket \
+		p5-XML-Fast>0:${PORTSDIR}/net/p5-XML-Fast \
+		p5-Text-CharWidth>0:${PORTSDIR}/textproc/p5-Text-CharWidth \
+		p5-Text-ParseWords>0:${PORTSDIR}/textproc/p5-Text-ParseWords \
+		p5-Text-Tabs+Wrap>0:${PORTSDIR}/textproc/p5-Text-Tabs+Wrap  \
+		p5-LWP-Protocol-https>0:${PORTSDIR}/www/p5-LWP-Protocol-https \
+		p5-libwww>0:${PORTSDIR}/www/p5-libwww
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		mplayer:${PORTSDIR}/multimedia/mplayer
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	trizen
 GH_PROJECT=	youtube-viewer
-GH_COMMIT=	116eb3f
+GH_COMMIT=	e3d45f7
 
-WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer
+WRKSRC_SUBDIR=	WWW-YoutubeViewer
 
-CONFIGURE_ARGS+=${DATADIR}
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	bin/gtk-youtube-viewer bin/youtube-viewer
 USE_PERL5=	5.16+ patch modbuild
+CONFIGURE_ARGS+=${DATADIR}
 
-PORTDOCS=	Changes README
-
-OPTIONS_DEFINE=	DOCS GCAP
-
-OPTIONS_MULTI=	USER_INTERFACE
-OPTIONS_MULTI_USER_INTERFACE=	CLI GTK2
-
-OPTIONS_DEFAULT=	CLI GCAP GTK2
-
-CLI_DESC=	Enable CLI version
-GCAP_DESC=	Enable YouTube captions support
-
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		GCAP GTK2
+OPTIONS_DEFAULT=	GCAP GTK2
+OPTIONS_SUB=		yes
 
+GCAP_DESC=		YouTube closed captions support
 GCAP_RUN_DEPENDS=	${LOCALBASE}/bin/gcap:${PORTSDIR}/multimedia/gcap
-GTK2_BUILD_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-			p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir
-GTK2_RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
-			p5-File-ShareDir>=0:${PORTSDIR}/devel/p5-File-ShareDir
+GTK2_BUILD_DEPENDS=	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
+			p5-Gtk2>0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+GTK2_RUN_DEPENDS=	p5-File-ShareDir>0:${PORTSDIR}/devel/p5-File-ShareDir \
+			p5-Gtk2>0:${PORTSDIR}/x11-toolkits/p5-Gtk2
+GTK2_CONFIGURE_ON=	--gtk-youtube-viewer
 
 .include <bsd.port.options.mk>
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MGTK2}
-CONFIGURE_ARGS+=-gtk-youtube-viewer
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|5.016|0|' ${WRKSRC}/Build.PL
-	@cd ${WRKSRC}/bin && ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
-		gtk-youtube-viewer youtube-viewer
-.if ${PERL_LEVEL} <= 501600
-	@${CP} ${FILESDIR}/yv_5.16_to_5.10.pl ${WRKSRC}
-	@${CP} ${WRKSRC}/bin/youtube-viewer ${WRKSRC}/bin/youtube-viewer-2patch
-	@${PERL} \
-	${WRKSRC}/yv_5.16_to_5.10.pl ${WRKSRC}/bin/youtube-viewer-2patch > \
-		${WRKSRC}/bin/youtube-viewer
-	@${RM} ${WRKSRC}/bin/youtube-viewer-2patch
-.endif
-
-.if ! ${PORT_OPTIONS:MCLI}
-	@${REINPLACE_CMD} -e "s|'bin/youtube-viewer',||" \
-		${WRKSRC}/Build.PL
-	@${REINPLACE_CMD} -i '' -e \
-		'/copy(catfile($$main_dir, qw(bin youtube-viewer))/,+1d' \
-		${WRKSRC}/Build.PL
-.endif
 
 post-install:
 .if ${PORT_OPTIONS:MGTK2}
@@ -101,14 +66,11 @@ post-install:
 	${SITE_PERL}/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${LN} -sf \
-	${SITE_PERL}/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${SITE_PERL}/auto/share/dist/WWW-YoutubeViewer/icons/gtk-youtube-viewer.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps
 .endif
 
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
 regression-test: build
 	cd ${WRKSRC} && ${PERL} ./Build test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/gtk-youtube-viewer/distinfo b/multimedia/gtk-youtube-viewer/distinfo
index a9a72fecbb50..d98894edb9e5 100644
--- a/multimedia/gtk-youtube-viewer/distinfo
+++ b/multimedia/gtk-youtube-viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtk-youtube-viewer-3.0.9.tar.gz) = c3ae4f5e05671c8e80073000871d7ed2a4795e08bce7f0fc17fe94cf2d3336c8
-SIZE (gtk-youtube-viewer-3.0.9.tar.gz) = 116144
+SHA256 (gtk-youtube-viewer-3.1.1.tar.gz) = 416289dac7c4bb29ad046e41bbf49faaca31f1827379e9e0082f5b282186531d
+SIZE (gtk-youtube-viewer-3.1.1.tar.gz) = 210183
diff --git a/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl b/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl
deleted file mode 100644
index fe62b563ea5d..000000000000
--- a/multimedia/gtk-youtube-viewer/files/yv_5.16_to_5.10.pl
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/local/bin/perl
-
-# usage: ./script.pl /usr/bin/youtube-viewer > new-youtube-viewer
-
-my $sub = '';
-while(<>){
-    s{^use 5.01\K\d}{0};
-    $sub = $1 if /^sub\s+(\w+)/;
-    s{^\s+(?:or)?\s*\K__SUB__->\(}{$sub(};
-    s{\b__SUB__\b}{\\&$sub};
-    print;
-}
diff --git a/multimedia/gtk-youtube-viewer/pkg-plist b/multimedia/gtk-youtube-viewer/pkg-plist
index 4725f527dc24..3a751dd0bda5 100644
--- a/multimedia/gtk-youtube-viewer/pkg-plist
+++ b/multimedia/gtk-youtube-viewer/pkg-plist
@@ -1,7 +1,6 @@
 %%GTK2%%bin/gtk-youtube-viewer
-%%CLI%%bin/youtube-viewer
+bin/youtube-viewer
 %%PERL5_MAN3%%/WWW::YoutubeViewer.3.gz
-%%PERL5_MAN3%%/WWW::YoutubeViewer::AuthToken.3.gz
 %%PERL5_MAN3%%/WWW::YoutubeViewer::ConfigData.3.gz
 %%PERL5_MAN3%%/WWW::YoutubeViewer::GetCaption.3.gz
 %%PERL5_MAN3%%/WWW::YoutubeViewer::Itags.3.gz
@@ -9,7 +8,6 @@
 %%PERL5_MAN3%%/WWW::YoutubeViewer::RegularExpressions.3.gz
 %%PERL5_MAN3%%/WWW::YoutubeViewer::Utils.3.gz
 %%SITE_PERL%%/WWW/YoutubeViewer.pm
-%%SITE_PERL%%/WWW/YoutubeViewer/AuthToken.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/ConfigData.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/GetCaption.pm
 %%SITE_PERL%%/WWW/YoutubeViewer/Itags.pm
@@ -18,13 +16,12 @@
 %%SITE_PERL%%/WWW/YoutubeViewer/Utils.pm
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.desktop
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.glade
-%%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/gtk-youtube-viewer.png
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/default_thumb.jpg
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/feed_icon.png
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/gtk-youtube-viewer.png
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/spinner.gif
 %%GTK2%%%%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons/user.png
-%%CLI%%man/man1/youtube-viewer.1.gz
+man/man1/youtube-viewer.1.gz
 %%GTK2%%share/applications/gtk-youtube-viewer.desktop
 %%GTK2%%share/pixmaps/gtk-youtube-viewer.png
 %%GTK2%%@dirrm %%SITE_PERL%%/auto/share/dist/WWW-YoutubeViewer/icons