diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index ef8a31e932c2..e46d25402c62 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -1,48 +1,48 @@
 # Created by: Fernan Aguero
 # $FreeBSD$
 
 PORTNAME=	CGI-FormBuilder
-PORTVERSION=	3.0900
-PORTREVISION=	1
+PORTVERSION=	3.1000
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/00$//}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S|00$||}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	FormBuilder for CGI
 
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
 USE_PERL5=	configure
-USES=		perl5 tar:tgz
+USES=		perl5
 
 # Follow upstream order in Makefile.PL
 OPTIONS_DEFINE=	HTML_TEMPLATE TEXT_TEMPLATE TEMPLATE CGI_FAST_TEMPLATE CGI_SSI CGI_SESSION
 OPTIONS_DEFAULT=HTML_TEMPLATE
 NO_OPTIONS_SORT=yes
 CGI_FAST_TEMPLATE_DESC=	CGI::FastTemplate support
 CGI_SESSION_DESC=	CGI::Session support
 CGI_SSI_DESC=		CGI::SSI support
 HTML_TEMPLATE_DESC=	HTML::Template support
 TEXT_TEMPLATE_DESC=	Text::Template support
 TEMPLATE_DESC=		Template Toolkit support
 
 CGI_FAST_TEMPLATE_BUILD_DEPENDS=p5-CGI-FastTemplate>=1.09:www/p5-CGI-FastTemplate
 CGI_FAST_TEMPLATE_RUN_DEPENDS=	p5-CGI-FastTemplate>=1.09:www/p5-CGI-FastTemplate
 CGI_SESSION_BUILD_DEPENDS=	p5-CGI-Session>=3.95:www/p5-CGI-Session
 CGI_SESSION_RUN_DEPENDS=p5-CGI-Session>=3.95:www/p5-CGI-Session
 CGI_SSI_BUILD_DEPENDS=	p5-CGI-SSI>=0.92:www/p5-CGI-SSI
 CGI_SSI_RUN_DEPENDS=	p5-CGI-SSI>=0.92:www/p5-CGI-SSI
 HTML_TEMPLATE_BUILD_DEPENDS=	p5-HTML-Template>=2.06:www/p5-HTML-Template
 HTML_TEMPLATE_RUN_DEPENDS=	p5-HTML-Template>=2.06:www/p5-HTML-Template
 TEXT_TEMPLATE_BUILD_DEPENDS=	p5-Text-Template>=1.43:textproc/p5-Text-Template
 TEXT_TEMPLATE_RUN_DEPENDS=	p5-Text-Template>=1.43:textproc/p5-Text-Template
 TEMPLATE_BUILD_DEPENDS=	p5-Template-Toolkit>=2.08:www/p5-Template-Toolkit
 TEMPLATE_RUN_DEPENDS=	p5-Template-Toolkit>=2.08:www/p5-Template-Toolkit
 
 .include <bsd.port.mk>
diff --git a/www/p5-CGI-FormBuilder/distinfo b/www/p5-CGI-FormBuilder/distinfo
index ff3297e962f0..9595605a3752 100644
--- a/www/p5-CGI-FormBuilder/distinfo
+++ b/www/p5-CGI-FormBuilder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (CGI-FormBuilder-3.09.tgz) = 654907527717c3bbb169c739a9a817f14552054619ab3c93d6a5f808649fa863
-SIZE (CGI-FormBuilder-3.09.tgz) = 163526
+TIMESTAMP = 1488738204
+SHA256 (CGI-FormBuilder-3.10.tar.gz) = aec99be0c0f067a7e7269c5378e5ae6c8d7dd39b368b4f12c0d8463b13ee7198
+SIZE (CGI-FormBuilder-3.10.tar.gz) = 162346