diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/Makefile ./Makefile
--- /usr/ports/multimedia/gtk-youtube-viewer/Makefile	2013-01-14 17:54:56.000000000 +0100
+++ ./Makefile	2013-03-11 15:01:24.000000000 +0100
@@ -2,7 +2,7 @@
 # $FreeBSD: head/multimedia/gtk-youtube-viewer/Makefile 307424 2012-11-14 19:10:45Z jhale $
 
 PORTNAME=	gtk-youtube-viewer
-PORTVERSION=	3.0.3
+PORTVERSION=	3.0.7
 CATEGORIES=	multimedia perl5
 
 MAINTAINER=	nemysis@gmx.ch
@@ -10,12 +10,16 @@
 
 LICENSE=	GPLv3
 
+# According to Build.PL
 BUILD_DEPENDS=	p5-Data-Dump>=0:${PORTSDIR}/devel/p5-Data-Dump \
-		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
-		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
-		p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast \
+		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
+		p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor \
+		p5-URI>=0:${PORTSDIR}/net/p5-URI \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https \
-		p5-libwww>=0:${PORTSDIR}/www/p5-libwww
+		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \
+		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
+		p5-XML-Fast>=0:${PORTSDIR}/net/p5-XML-Fast
 RUN_DEPENDS:=	${BUILD_DEPENDS} \
 		mplayer:${PORTSDIR}/multimedia/mplayer
 TEST_DEPENDS=	p5-Test-More-UTF8>=0:${PORTSDIR}/devel/p5-Test-More-UTF8
@@ -25,23 +29,34 @@
 USE_GITHUB=	yes
 GH_ACCOUNT=	trizen
 GH_PROJECT=	youtube-viewer
-GH_COMMIT=	c4496ed
+GH_COMMIT=	c26d9a7
 
 WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-${GH_PROJECT}-${GH_COMMIT}/WWW-YoutubeViewer
 
 PERL_MODBUILD=	yes
 
 MAN1=		youtube-viewer.1
-MAN3=		WWW::YoutubeViewer.3
+MAN3=		WWW::YoutubeViewer::RegularExpressions.3 \
+		WWW::YoutubeViewer.3 \
+		WWW::YoutubeViewer::Itags.3 \
+		WWW::YoutubeViewer::Utils.3 \
+		WWW::YoutubeViewer::GetCaption.3 \
+		WWW::YoutubeViewer::ParseXML.3
 
 PORTDOCS=	Changes README
 
-OPTIONS_DEFINE=	GTK2 GCAP
+OPTIONS_DEFINE=	DOCS GTK2 GCAP
 OPTIONS_DEFAULT=GTK2 GCAP
 GCAP_DESC=	Enable YouTube captions support
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MGTK2}
 BUILD_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
 RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2
@@ -56,23 +71,25 @@
 .endif
 
 post-patch:
-	cd ${WRKSRC} && ${REINPLACE_CMD} -n '1,/create_build_script()/p' \
-		Build.PL
-	cd ${WRKSRC}/bin && ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
+	@${REINPLACE_CMD} \
+		-e 's|usr share|(${PREFIX})|' \
+		-e 's|5.016|0|' \
+			${WRKSRC}/Build.PL
+	@cd ${WRKSRC}/bin && ${REINPLACE_CMD} -e 's|/usr|${PREFIX}|g' \
 		gtk-youtube-viewer youtube-viewer
 
 post-install:
 .if ${PORT_OPTIONS:MGTK2}
-	${MKDIR} ${PREFIX}/share/applications
+	@${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer.desktop ${PREFIX}/share/applications
-	${MKDIR} ${DATADIR}/icons
+	@${MKDIR} ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer.glade ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/share/gtk-youtube-viewer-icons/* ${DATADIR}/icons
 	${INSTALL_DATA} ${WRKSRC}/share/icons/gtk-youtube-viewer.png ${PREFIX}/share/pixmaps
 .endif
 
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/distinfo ./distinfo
--- /usr/ports/multimedia/gtk-youtube-viewer/distinfo	2013-01-14 17:54:56.000000000 +0100
+++ ./distinfo	2013-03-11 13:37:24.000000000 +0100
@@ -1,2 +1,2 @@
-SHA256 (gtk-youtube-viewer-3.0.3.tar.gz) = 5775915a38852538951d308640f8a76f31eb7c2a52104d61410dd9eee46a337b
-SIZE (gtk-youtube-viewer-3.0.3.tar.gz) = 106567
+SHA256 (gtk-youtube-viewer-3.0.7.tar.gz) = 3a7aea5ef93d8d7015295771047172fea588b9135a1707585df253a6ed52f1dc
+SIZE (gtk-youtube-viewer-3.0.7.tar.gz) = 116915
diff -ruN --exclude=CVS /usr/ports/multimedia/gtk-youtube-viewer/pkg-plist ./pkg-plist
--- /usr/ports/multimedia/gtk-youtube-viewer/pkg-plist	2013-01-14 17:54:56.000000000 +0100
+++ ./pkg-plist	2013-03-11 13:47:00.000000000 +0100
@@ -1,18 +1,33 @@
 %%GTK2%%bin/gtk-youtube-viewer
 bin/youtube-viewer
 %%SITE_PERL%%/WWW/YoutubeViewer.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/YoutubeViewer/.packlist
+%%SITE_PERL%%/WWW/YoutubeViewer/GetCaption.pm
+%%SITE_PERL%%/WWW/YoutubeViewer/Itags.pm
+%%SITE_PERL%%/WWW/YoutubeViewer/ParseXML.pm
+%%SITE_PERL%%/WWW/YoutubeViewer/RegularExpressions.pm
+%%SITE_PERL%%/WWW/YoutubeViewer/Utils.pm
+%%GTK2%%%%SITE_PERL%%/mach/auto/WWW/YoutubeViewer/.packlist
 %%GTK2%%share/applications/gtk-youtube-viewer.desktop
-%%GTK2%%share/gtk-youtube-viewer/gtk-youtube-viewer.glade
-%%GTK2%%share/gtk-youtube-viewer/icons/default_thumb.jpg
-%%GTK2%%share/gtk-youtube-viewer/icons/feed_icon.png
-%%GTK2%%share/gtk-youtube-viewer/icons/gtk-youtube-viewer.png
-%%GTK2%%share/gtk-youtube-viewer/icons/spinner.gif
-%%GTK2%%share/gtk-youtube-viewer/icons/user.png
+%%PORTDOCS%%%%DOCSDIR%%/Changes
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%GTK2%%%%DATADIR%%/gtk-youtube-viewer.glade
+%%GTK2%%%%DATADIR%%/icons/default_thumb.jpg
+%%GTK2%%%%DATADIR%%/icons/donate.png
+%%GTK2%%%%DATADIR%%/icons/feed_icon.png
+%%GTK2%%%%DATADIR%%/icons/gtk-youtube-viewer.png
+%%GTK2%%%%DATADIR%%/icons/spinner.gif
+%%GTK2%%%%DATADIR%%/icons/user.png
 %%GTK2%%share/pixmaps/gtk-youtube-viewer.png
-%%GTK2%%@dirrm share/gtk-youtube-viewer/icons
-%%GTK2%%@dirrm share/gtk-youtube-viewer
-%%GTK2%%@dirrmtry share/applications
-@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW/YoutubeViewer
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/WWW
-@dirrmtry %%SITE_PERL%%/WWW
+%%GTK2%%@dirrm %%DATADIR%%/icons
+%%GTK2%%@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%GTK2%%@dirrm %%SITE_PERL%%/mach/auto/WWW/YoutubeViewer
+%%GTK2%%@dirrm %%SITE_PERL%%/mach/auto/WWW
+%%GTK2%%@dirrm %%SITE_PERL%%/mach/auto
+%%GTK2%%@dirrm %%SITE_PERL%%/mach
+@dirrm %%SITE_PERL%%/WWW/YoutubeViewer
+@dirrm %%SITE_PERL%%/WWW
+@dirrm %%SITE_PERL%%
+@dirrmtry lib/perl5/site_perl
+@dirrmtry lib/perl5/5.14.2
+@dirrmtry lib/perl5