diff --git a/devel/Makefile b/devel/Makefile
index 40f2654fd3e2..55efbf575ef8 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -3217,6 +3217,7 @@
     SUBDIR += p5-Sub-Name
     SUBDIR += p5-Sub-Override
     SUBDIR += p5-Sub-Prototype
+    SUBDIR += p5-Sub-Quote
     SUBDIR += p5-Sub-Signatures
     SUBDIR += p5-Sub-Uplevel
     SUBDIR += p5-Sub-WrapPackages
diff --git a/devel/p5-Moo/Makefile b/devel/p5-Moo/Makefile
index 0c9cdbf60de1..b3e4b882f30d 100644
--- a/devel/p5-Moo/Makefile
+++ b/devel/p5-Moo/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Moo
-PORTVERSION=	2.002005
+PORTVERSION=	2.003000
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
@@ -17,7 +17,8 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-Class-Method-Modifiers>=1.10:devel/p5-Class-Method-Modifiers \
 		p5-Devel-GlobalDestruction>=0.11:devel/p5-Devel-GlobalDestruction \
 		p5-Module-Runtime>=0.014:devel/p5-Module-Runtime \
-		p5-Role-Tiny>=2.000004:devel/p5-Role-Tiny
+		p5-Role-Tiny>=2.000004:devel/p5-Role-Tiny \
+		p5-Sub-Quote>=2.003001:devel/p5-Sub-Quote
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal \
 		${XS_BUILD_DEPENDS}
diff --git a/devel/p5-Moo/distinfo b/devel/p5-Moo/distinfo
index e6479488fce7..1a47ece91c0e 100644
--- a/devel/p5-Moo/distinfo
+++ b/devel/p5-Moo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1478451797
-SHA256 (Moo-2.002005.tar.gz) = 8147f98a43f7beb808773202b05d3fba25d5fca018ad939d7e529f4d36d6dc68
-SIZE (Moo-2.002005.tar.gz) = 106129
+TIMESTAMP = 1481311527
+SHA256 (Moo-2.003000.tar.gz) = ccab84b1377e52922026b24b2ed51d83c439757f2b0783fffa73ac22b4fb3dd2
+SIZE (Moo-2.003000.tar.gz) = 95980
diff --git a/devel/p5-Moo/pkg-plist b/devel/p5-Moo/pkg-plist
index 4a66d6ececba..562cb3c24702 100644
--- a/devel/p5-Moo/pkg-plist
+++ b/devel/p5-Moo/pkg-plist
@@ -12,11 +12,7 @@
 %%SITE_PERL%%/Moo/_mro.pm
 %%SITE_PERL%%/Moo/_strictures.pm
 %%SITE_PERL%%/Moo/sification.pm
-%%SITE_PERL%%/Sub/Defer.pm
-%%SITE_PERL%%/Sub/Quote.pm
 %%SITE_PERL%%/oo.pm
 %%PERL5_MAN3%%/Moo.3.gz
 %%PERL5_MAN3%%/Moo::Role.3.gz
-%%PERL5_MAN3%%/Sub::Defer.3.gz
-%%PERL5_MAN3%%/Sub::Quote.3.gz
 %%PERL5_MAN3%%/oo.3.gz
diff --git a/devel/p5-Sub-Quote/Makefile b/devel/p5-Sub-Quote/Makefile
new file mode 100644
index 000000000000..38d970364ba1
--- /dev/null
+++ b/devel/p5-Sub-Quote/Makefile
@@ -0,0 +1,25 @@
+# Created by: Adam Weinberger <adamw@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	Sub-Quote
+PORTVERSION=	2.003001
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+MASTER_SITE_SUBDIR=	CPAN:HAARG
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	adamw@FreeBSD.org
+COMMENT=	Efficient generation of subroutines via string eval
+
+LICENSE=	ART10 GPLv1
+LICENSE_COMB=	dual
+
+TEST_DEPENDS=	p5-Test-Fatal>=0.003:devel/p5-Test-Fatal
+
+CONFLICTS_INSTALL=	p5-Moo-[01]* p5-Moo-2.00[0-2]*
+
+USES=		perl5
+USE_PERL5=	configure
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/devel/p5-Sub-Quote/distinfo b/devel/p5-Sub-Quote/distinfo
new file mode 100644
index 000000000000..c34c7e79a9bd
--- /dev/null
+++ b/devel/p5-Sub-Quote/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1481311124
+SHA256 (Sub-Quote-2.003001.tar.gz) = 9d471d8e13e7ce4793d5a5ec04a60fface14dd53be78dd94d228871915cfd1f9
+SIZE (Sub-Quote-2.003001.tar.gz) = 19131
diff --git a/devel/p5-Sub-Quote/pkg-descr b/devel/p5-Sub-Quote/pkg-descr
new file mode 100644
index 000000000000..d90b70c6a66f
--- /dev/null
+++ b/devel/p5-Sub-Quote/pkg-descr
@@ -0,0 +1,3 @@
+This package provides performant ways to generate subroutines from strings.
+
+WWW: https://metacpan.org/pod/Sub::Quote
diff --git a/devel/p5-Sub-Quote/pkg-plist b/devel/p5-Sub-Quote/pkg-plist
new file mode 100644
index 000000000000..b1d0415e8b07
--- /dev/null
+++ b/devel/p5-Sub-Quote/pkg-plist
@@ -0,0 +1,4 @@
+%%SITE_PERL%%/Sub/Defer.pm
+%%SITE_PERL%%/Sub/Quote.pm
+%%PERL5_MAN3%%/Sub::Defer.3.gz
+%%PERL5_MAN3%%/Sub::Quote.3.gz