diff --git a/MOVED b/MOVED
index 4b8d5a96e0c2..70636015a5bb 100644
--- a/MOVED
+++ b/MOVED
@@ -5184,3 +5184,4 @@ games/tmw|games/manaplus|2013-11-12|Replaced with games/manaplus
 graphics/mesagl||2013-11-14|Old unmaintained version. Use graphics/libosmesa instead
 editors/xxe||2013-11-15|Has expired: XXE becomes unfetchable every 3-4 months as distfile is replaced with new version.  This high-maintenance port requires a maintainer to avoid removal.
 editors/xml2rfc-xxe||2013-11-15|Has expired: Depends on editors/xxe, which is due to be removed due to lack of maintainer
+devel/perltidy|devel/p5-Perl-Tidy|2013-11-15|Renamed to match upstream naming
diff --git a/devel/Makefile b/devel/Makefile
index ded5ff63a673..2e5a636335de 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2541,6 +2541,7 @@
     SUBDIR += p5-Perl-Metrics-Simple
     SUBDIR += p5-Perl-OSType
     SUBDIR += p5-Perl-PrereqScanner
+    SUBDIR += p5-Perl-Tidy
     SUBDIR += p5-Perl-Unsafe-Signals
     SUBDIR += p5-Perl-Version
     SUBDIR += p5-Perl6-Builtins
@@ -3300,7 +3301,6 @@
     SUBDIR += pep8
     SUBDIR += performance
     SUBDIR += perlconsole
-    SUBDIR += perltidy
     SUBDIR += php-java-bridge
     SUBDIR += php-libawl
     SUBDIR += php-memoize
diff --git a/devel/perltidy/Makefile b/devel/p5-Perl-Tidy/Makefile
similarity index 85%
rename from devel/perltidy/Makefile
rename to devel/p5-Perl-Tidy/Makefile
index e0a5da991a42..15ca2c557bbb 100644
--- a/devel/perltidy/Makefile
+++ b/devel/p5-Perl-Tidy/Makefile
@@ -1,12 +1,12 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	perltidy
+PORTNAME=	Perl-Tidy
 PORTVERSION=	20130922
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	Perl
-DISTNAME=	Perl-Tidy-${PORTVERSION}
+PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Indents and reformats Perl scripts to make them easier to read
diff --git a/devel/perltidy/distinfo b/devel/p5-Perl-Tidy/distinfo
similarity index 100%
rename from devel/perltidy/distinfo
rename to devel/p5-Perl-Tidy/distinfo
diff --git a/devel/perltidy/pkg-descr b/devel/p5-Perl-Tidy/pkg-descr
similarity index 100%
rename from devel/perltidy/pkg-descr
rename to devel/p5-Perl-Tidy/pkg-descr
diff --git a/devel/perltidy/pkg-plist b/devel/p5-Perl-Tidy/pkg-plist
similarity index 100%
rename from devel/perltidy/pkg-plist
rename to devel/p5-Perl-Tidy/pkg-plist