diff --git a/x11/p5-Clipboard/Makefile b/x11/p5-Clipboard/Makefile
index a397ef155eba..4039f2ba5e52 100644
--- a/x11/p5-Clipboard/Makefile
+++ b/x11/p5-Clipboard/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	Clipboard
-PORTVERSION=	0.13
-PORTREVISION=	1
+PORTVERSION=	0.20
 CATEGORIES=	x11 perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	CPAN:KING
+MASTER_SITE_SUBDIR=	CPAN:SHLOMIF
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
@@ -14,13 +13,16 @@ COMMENT=	Access to X11 clipboard from Perl
 
 LICENSE=	ART10 GPLv1+
 LICENSE_COMB=	dual
+LICENSE_FILE_ART10=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	p5-Spiffy>=0:devel/p5-Spiffy
-RUN_DEPENDS:=	${BUILD_DEPENDS} \
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-CGI>=0:www/p5-CGI \
+		p5-URI>=0:net/p5-URI \
 		xclip:x11/xclip
 
 USES=		perl5
 USE_PERL5=	configure
+
 NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/x11/p5-Clipboard/distinfo b/x11/p5-Clipboard/distinfo
index 5ebd82a88e94..000de0c83e8a 100644
--- a/x11/p5-Clipboard/distinfo
+++ b/x11/p5-Clipboard/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Clipboard-0.13.tar.gz) = eebf1c9cb2484be850abdae017147967cf47f8ccd99293771517674b0046ec8a
-SIZE (Clipboard-0.13.tar.gz) = 21616
+TIMESTAMP = 1564158001
+SHA256 (Clipboard-0.20.tar.gz) = 3f7d0a8eafec57072f9574dfd552e1cb8db26c09079c50dbef38f3c97ce25f60
+SIZE (Clipboard-0.20.tar.gz) = 25047
diff --git a/x11/p5-Clipboard/pkg-plist b/x11/p5-Clipboard/pkg-plist
index 803f50ec39aa..2bc7930be14e 100644
--- a/x11/p5-Clipboard/pkg-plist
+++ b/x11/p5-Clipboard/pkg-plist
@@ -3,7 +3,6 @@ bin/clipbrowse
 bin/clipedit
 bin/clipfilter
 bin/clipjoin
-%%PERL5_MAN3%%/Clipboard.3.gz
 %%SITE_PERL%%/Clipboard.pm
 %%SITE_PERL%%/Clipboard/MacPasteboard.pm
 %%SITE_PERL%%/Clipboard/Win32.pm
@@ -13,3 +12,7 @@ bin/clipjoin
 %%PERL5_MAN1%%/clipedit.1.gz
 %%PERL5_MAN1%%/clipfilter.1.gz
 %%PERL5_MAN1%%/clipjoin.1.gz
+%%PERL5_MAN3%%/Clipboard.3.gz
+%%PERL5_MAN3%%/Clipboard::MacPasteboard.3.gz
+%%PERL5_MAN3%%/Clipboard::Win32.3.gz
+%%PERL5_MAN3%%/Clipboard::Xclip.3.gz