From e56a7da8946973ad5233bf881538298e30f472eb Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Mon, 4 Oct 2021 21:56:43 +0200
Subject: [PATCH] *: re-assign kuriyama@s ports to the pool, commit bit
 safekept

With hat:	portmgr-secretary
---
 archivers/p5-IO-Zlib/Makefile                            | 2 +-
 audio/p5-Audio-Ecasound/Makefile                         | 2 +-
 audio/p5-Net-LibLO/Makefile                              | 2 +-
 benchmarks/bonnie/Makefile                               | 2 +-
 comms/conserver-com/Makefile                             | 2 +-
 converters/p5-Convert-Moji/Makefile                      | 2 +-
 converters/p5-Data-AMF/Makefile                          | 2 +-
 converters/p5-JSON/Makefile                              | 2 +-
 converters/p5-JSON1/Makefile                             | 2 +-
 converters/p5-Unicode-RecursiveDowngrade/Makefile        | 2 +-
 databases/p5-Amon2-DBI/Makefile                          | 2 +-
 databases/p5-AnyEvent-DBD-Pg/Makefile                    | 2 +-
 databases/p5-CGI-Session-Driver-memcached/Makefile       | 2 +-
 databases/p5-Class-DBI-Plugin-Iterator/Makefile          | 2 +-
 databases/p5-Class-DBI-Plugin-Pager/Makefile             | 2 +-
 databases/p5-Class-DBI-Plugin-Senna/Makefile             | 2 +-
 databases/p5-DBIx-Class-AsFdat/Makefile                  | 2 +-
 databases/p5-DBIx-Class-DeploymentHandler/Makefile       | 2 +-
 databases/p5-DBIx-Class-Fixtures/Makefile                | 2 +-
 databases/p5-DBIx-Class-InflateColumn-FS/Makefile        | 2 +-
 databases/p5-DBIx-Class-Migration/Makefile               | 2 +-
 databases/p5-DBIx-Class-Tree-NestedSet/Makefile          | 2 +-
 databases/p5-DBIx-Class-Tree/Makefile                    | 2 +-
 databases/p5-DBIx-Connector/Makefile                     | 2 +-
 databases/p5-DBIx-DBHResolver/Makefile                   | 2 +-
 databases/p5-DBIx-Inspector/Makefile                     | 2 +-
 databases/p5-DBIx-QueryLog/Makefile                      | 2 +-
 databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile | 2 +-
 databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile      | 2 +-
 databases/p5-DBIx-Skinny-Pager/Makefile                  | 2 +-
 databases/p5-DBIx-Skinny-Schema-Loader/Makefile          | 2 +-
 databases/p5-DBIx-Skinny/Makefile                        | 2 +-
 databases/p5-DBIx-TransactionManager/Makefile            | 2 +-
 databases/p5-GitDDL-Migrator/Makefile                    | 2 +-
 databases/p5-GitDDL/Makefile                             | 2 +-
 databases/p5-RedisDB-Parser/Makefile                     | 2 +-
 databases/p5-RedisDB/Makefile                            | 2 +-
 databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile    | 2 +-
 databases/p5-SQL-Maker/Makefile                          | 2 +-
 databases/p5-Search-Namazu/Makefile                      | 2 +-
 databases/p5-Teng/Makefile                               | 2 +-
 databases/p5-Test-Fixture-DBI/Makefile                   | 2 +-
 databases/p5-Test-mysqld/Makefile                        | 2 +-
 databases/p5-Test-postgresql/Makefile                    | 2 +-
 databases/p5-TokyoCabinet/Makefile                       | 2 +-
 databases/p5-tokyotyrant/Makefile                        | 2 +-
 databases/tokyocabinet/Makefile                          | 2 +-
 deskutils/howm/Makefile                                  | 2 +-
 devel/cpan-upload-http/Makefile                          | 2 +-
 devel/flex-sdk/Makefile                                  | 2 +-
 devel/p5-ARGV-Struct/Makefile                            | 2 +-
 devel/p5-Any-Moose/Makefile                              | 2 +-
 devel/p5-AnyEvent-Filesys-Notify/Makefile                | 2 +-
 devel/p5-AnyEvent-MessagePack/Makefile                   | 2 +-
 devel/p5-App-FatPacker/Makefile                          | 2 +-
 devel/p5-App-cpanminus/Makefile                          | 2 +-
 devel/p5-App-scan_prereqs_cpanfile/Makefile              | 2 +-
 devel/p5-B-Compiling/Makefile                            | 2 +-
 devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile         | 2 +-
 devel/p5-B-Size2/Makefile                                | 2 +-
 devel/p5-BSD-devstat/Makefile                            | 2 +-
 devel/p5-CHI/Makefile                                    | 2 +-
 devel/p5-Calendar-Simple/Makefile                        | 2 +-
 devel/p5-Carp-Always/Makefile                            | 2 +-
 devel/p5-Carp-Datum/Makefile                             | 2 +-
 devel/p5-Class-Accessor-Constructor/Makefile             | 2 +-
 devel/p5-Class-Forward/Makefile                          | 2 +-
 devel/p5-Class-Method-Modifiers-Fast/Makefile            | 2 +-
 devel/p5-Class-MethodMapper/Makefile                     | 2 +-
 devel/p5-Class-Tiny/Makefile                             | 2 +-
 devel/p5-Compiler-Lexer/Makefile                         | 2 +-
 devel/p5-Config-MySQL/Makefile                           | 2 +-
 devel/p5-Data-Inherited/Makefile                         | 2 +-
 devel/p5-Data-Localize/Makefile                          | 2 +-
 devel/p5-Data-MessagePack-Stream/Makefile                | 2 +-
 devel/p5-Data-MessagePack/Makefile                       | 2 +-
 devel/p5-Data-Model/Makefile                             | 2 +-
 devel/p5-Data-Page-NoTotalEntries/Makefile               | 2 +-
 devel/p5-Data-Recursive-Encode/Makefile                  | 2 +-
 devel/p5-Data-SExpression/Makefile                       | 2 +-
 devel/p5-Data-Util/Makefile                              | 2 +-
 devel/p5-Data-Visitor-Encode/Makefile                    | 2 +-
 devel/p5-Devel-BeginLift/Makefile                        | 2 +-
 devel/p5-Devel-Caller-Perl/Makefile                      | 2 +-
 devel/p5-Devel-CoreStack/Makefile                        | 2 +-
 devel/p5-Devel-Cover-Report-Clover/Makefile              | 2 +-
 devel/p5-Devel-Declare-Parser/Makefile                   | 2 +-
 devel/p5-Devel-KYTProf/Makefile                          | 2 +-
 devel/p5-Devel-StackTrace-AsHTML/Makefile                | 2 +-
 devel/p5-Devel-StackTrace-WithLexicals/Makefile          | 2 +-
 devel/p5-Dist-Metadata/Makefile                          | 2 +-
 devel/p5-Eval-WithLexicals/Makefile                      | 2 +-
 devel/p5-Exporter-Declare/Makefile                       | 2 +-
 devel/p5-ExtUtils-Install/Makefile                       | 2 +-
 devel/p5-Fennec-Lite/Makefile                            | 2 +-
 devel/p5-File-ShareDir-ProjectDistDir/Makefile           | 2 +-
 devel/p5-File-Spec-Native/Makefile                       | 2 +-
 devel/p5-File-Sync/Makefile                              | 2 +-
 devel/p5-File-Tail/Makefile                              | 2 +-
 devel/p5-Filesys-Notify-KQueue/Makefile                  | 2 +-
 devel/p5-Filesys-Notify-Simple/Makefile                  | 2 +-
 devel/p5-FindBin-libs/Makefile                           | 2 +-
 devel/p5-Hash-MoreUtils/Makefile                         | 2 +-
 devel/p5-Hash-MultiValue/Makefile                        | 2 +-
 devel/p5-IO-Callback/Makefile                            | 2 +-
 devel/p5-IO-FDPass/Makefile                              | 2 +-
 devel/p5-IO-File-AtomicChange/Makefile                   | 2 +-
 devel/p5-IO-KQueue/Makefile                              | 2 +-
 devel/p5-IPC-System-Simple/Makefile                      | 2 +-
 devel/p5-JSON-Pointer/Makefile                           | 2 +-
 devel/p5-Jonk/Makefile                                   | 2 +-
 devel/p5-Log-Any-Adapter-Dispatch/Makefile               | 2 +-
 devel/p5-Log-Any/Makefile                                | 2 +-
 devel/p5-Log-Contextual/Makefile                         | 2 +-
 devel/p5-Log-Dispatch-Colorful/Makefile                  | 2 +-
 devel/p5-Log-Dispatch-Screen-Color/Makefile              | 2 +-
 devel/p5-Log-Dump/Makefile                               | 2 +-
 devel/p5-Meta-Builder/Makefile                           | 2 +-
 devel/p5-Module-Collect/Makefile                         | 2 +-
 devel/p5-Module-Functions/Makefile                       | 2 +-
 devel/p5-Module-Install-AuthorRequires/Makefile          | 2 +-
 devel/p5-Module-Install-AuthorTests/Makefile             | 2 +-
 devel/p5-Module-Install-Repository/Makefile              | 2 +-
 devel/p5-Module-Metadata/Makefile                        | 2 +-
 devel/p5-Module-Reader/Makefile                          | 2 +-
 devel/p5-Module-Setup/Makefile                           | 2 +-
 devel/p5-Module-Versions/Makefile                        | 2 +-
 devel/p5-MooX-late/Makefile                              | 2 +-
 devel/p5-MooseX-CompileTime-Traits/Makefile              | 2 +-
 devel/p5-MooseX-ConfigFromFile/Makefile                  | 2 +-
 devel/p5-MooseX-Types-Path-Tiny/Makefile                 | 2 +-
 devel/p5-MooseX-Types-Stringlike/Makefile                | 2 +-
 devel/p5-MouseX-AttributeHelpers/Makefile                | 2 +-
 devel/p5-MouseX-Getopt/Makefile                          | 2 +-
 devel/p5-MouseX-Types/Makefile                           | 2 +-
 devel/p5-OrePAN2/Makefile                                | 2 +-
 devel/p5-Ouch/Makefile                                   | 2 +-
 devel/p5-POEx-Role-SessionInstantiation/Makefile         | 2 +-
 devel/p5-POEx-Role-Streaming/Makefile                    | 2 +-
 devel/p5-POEx-Types/Makefile                             | 2 +-
 devel/p5-POSIX-strftime-Compiler/Makefile                | 2 +-
 devel/p5-Parallel-Async/Makefile                         | 2 +-
 devel/p5-Parallel-Scoreboard/Makefile                    | 2 +-
 devel/p5-Parse-LocalDistribution/Makefile                | 2 +-
 devel/p5-Parse-PMFile/Makefile                           | 2 +-
 devel/p5-Path-Extended/Makefile                          | 2 +-
 devel/p5-Path-IsDev/Makefile                             | 2 +-
 devel/p5-Path-Iterator-Rule/Makefile                     | 2 +-
 devel/p5-Paws/Makefile                                   | 2 +-
 devel/p5-Perl-Metrics-Lite/Makefile                      | 2 +-
 devel/p5-Perl-Metrics-Simple/Makefile                    | 2 +-
 devel/p5-Perl-PrereqScanner-Lite/Makefile                | 2 +-
 devel/p5-Proc-Guard/Makefile                             | 2 +-
 devel/p5-Proc-Pidfile/Makefile                           | 2 +-
 devel/p5-Project-Libs/Makefile                           | 2 +-
 devel/p5-Qudo/Makefile                                   | 2 +-
 devel/p5-Regexp-Assemble-Compressed/Makefile             | 2 +-
 devel/p5-Regexp-Shellish/Makefile                        | 2 +-
 devel/p5-Scalar-Util-LooksLikeNumber/Makefile            | 2 +-
 devel/p5-Stream-Buffered/Makefile                        | 2 +-
 devel/p5-Sys-Sendfile/Makefile                           | 2 +-
 devel/p5-TAP-Formatter-JUnit/Makefile                    | 2 +-
 devel/p5-TAP-Harness-JUnit/Makefile                      | 2 +-
 devel/p5-Term-ReadPassword/Makefile                      | 2 +-
 devel/p5-Test-Declare/Makefile                           | 2 +-
 devel/p5-Test-Filename/Makefile                          | 2 +-
 devel/p5-Test-LoadAllModules/Makefile                    | 2 +-
 devel/p5-Test-Mock-Guard/Makefile                        | 2 +-
 devel/p5-Test-MockObject/Makefile                        | 2 +-
 devel/p5-Test-Most/Makefile                              | 2 +-
 devel/p5-Test-Name-FromLine/Makefile                     | 2 +-
 devel/p5-Test-Net-LDAP/Makefile                          | 2 +-
 devel/p5-Test-OpenLDAP/Makefile                          | 2 +-
 devel/p5-Test-PerlTidy/Makefile                          | 2 +-
 devel/p5-Test-Requires/Makefile                          | 2 +-
 devel/p5-Test-SharedFork/Makefile                        | 2 +-
 devel/p5-Test-TCP/Makefile                               | 2 +-
 devel/p5-Test-Time/Makefile                              | 2 +-
 devel/p5-Test-WWW-Mechanize-PSGI/Makefile                | 2 +-
 devel/p5-Text-vFile-asData/Makefile                      | 2 +-
 devel/p5-Time-Crontab/Makefile                           | 2 +-
 devel/p5-Types-URI/Makefile                              | 2 +-
 devel/p5-Types-UUID/Makefile                             | 2 +-
 devel/p5-UNIVERSAL-require/Makefile                      | 2 +-
 devel/p5-UNIVERSAL-which/Makefile                        | 2 +-
 devel/p5-YAML-AppConfig/Makefile                         | 2 +-
 devel/p5-asa/Makefile                                    | 2 +-
 devel/p5-carton/Makefile                                 | 2 +-
 devel/p5-cpan-listchanges/Makefile                       | 2 +-
 devel/p5-iCal-Parser/Makefile                            | 2 +-
 devel/p5-local-lib/Makefile                              | 2 +-
 devel/rubygem-cool.io/Makefile                           | 2 +-
 devel/rubygem-ditz/Makefile                              | 2 +-
 devel/rubygem-iobuffer/Makefile                          | 2 +-
 ftp/p5-Net-FTP-Common/Makefile                           | 2 +-
 ftp/p5-Net-FTP-Recursive/Makefile                        | 2 +-
 graphics/flasm/Makefile                                  | 2 +-
 graphics/p5-Barcode-ZBar/Makefile                        | 2 +-
 graphics/p5-Convert-Color/Makefile                       | 2 +-
 graphics/py-blockdiagcontrib-cisco/Makefile              | 2 +-
 japanese/ajaxzip2-core/Makefile                          | 2 +-
 japanese/ajaxzip2-data/Makefile                          | 2 +-
 japanese/man-doc/Makefile                                | 2 +-
 japanese/p5-Date-Japanese-Holiday/Makefile               | 2 +-
 japanese/p5-Encode-ISO2022/Makefile                      | 2 +-
 japanese/p5-Encode-JP-Emoji/Makefile                     | 2 +-
 japanese/p5-Encode-JP-Mobile/Makefile                    | 2 +-
 japanese/p5-Jcode/Makefile                               | 2 +-
 japanese/p5-Lingua-JA-Kana/Makefile                      | 2 +-
 japanese/p5-Lingua-JA-Moji/Makefile                      | 2 +-
 japanese/p5-Lingua-JA-Regular-Unicode/Makefile           | 2 +-
 japanese/p5-PDFJ/Makefile                                | 2 +-
 japanese/zipcodes/Makefile                               | 2 +-
 lang/p5-JavaScript-Value-Escape/Makefile                 | 2 +-
 mail/p5-Email-Address-Loose/Makefile                     | 2 +-
 mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile          | 2 +-
 mail/p5-Email-Sender-Transport-SMTPS/Makefile            | 2 +-
 mail/p5-Email-Valid-Loose/Makefile                       | 2 +-
 mail/p5-IMAP-Sieve/Makefile                              | 2 +-
 mail/p5-MIME-EcoEncode/Makefile                          | 2 +-
 mail/p5-Mail-Tools/Makefile                              | 2 +-
 mail/p5-Parse-MIME/Makefile                              | 2 +-
 math/p5-Math-Vec/Makefile                                | 2 +-
 math/p5-Number-Misc/Makefile                             | 2 +-
 misc/amanda-perl-wrapper/Makefile                        | 2 +-
 misc/elscreen/Makefile                                   | 2 +-
 net-mgmt/ipcalc/Makefile                                 | 2 +-
 net-mgmt/sblim-wbemcli/Makefile                          | 2 +-
 net/p5-AnyEvent-MPRPC/Makefile                           | 2 +-
 net/p5-Net-APNS/Makefile                                 | 2 +-
 net/p5-Net-APNs-Extended/Makefile                        | 2 +-
 net/p5-Net-Amazon-Signature-V3/Makefile                  | 2 +-
 net/p5-Net-Amazon-Signature-V4/Makefile                  | 2 +-
 net/p5-Net-CIDR-MobileJP/Makefile                        | 2 +-
 net/p5-Net-Google-Analytics/Makefile                     | 2 +-
 net/p5-Net-SSH-Mechanize/Makefile                        | 2 +-
 net/p5-Net-Server-Coro/Makefile                          | 2 +-
 net/p5-Net-Telnet/Makefile                               | 2 +-
 net/p5-Net-Traceroute/Makefile                           | 2 +-
 net/p5-POEx-Role-TCPServer/Makefile                      | 2 +-
 net/p5-POSIX-Socket/Makefile                             | 2 +-
 net/p5-POSIX-getpeername/Makefile                        | 2 +-
 net/p5-RPC-EPC-Service/Makefile                          | 2 +-
 net/p5-Server-Starter/Makefile                           | 2 +-
 net/p5-URI-Match/Makefile                                | 2 +-
 net/p5-URI-Template-Restrict/Makefile                    | 2 +-
 net/tramp/Makefile                                       | 2 +-
 print/p5-Font-FreeType/Makefile                          | 2 +-
 security/p5-App-TLSMe/Makefile                           | 2 +-
 security/p5-Crypt-URandom/Makefile                       | 2 +-
 security/p5-Digest-MurmurHash/Makefile                   | 2 +-
 security/starttls/Makefile                               | 2 +-
 sysutils/p5-Proclet/Makefile                             | 2 +-
 sysutils/p5-Schedule-At/Makefile                         | 2 +-
 sysutils/rubygem-fluent-plugin-tail-asis/Makefile        | 2 +-
 textproc/dsssl-docbook-modular/Makefile                  | 2 +-
 textproc/html/Makefile                                   | 2 +-
 textproc/iso12083/Makefile                               | 2 +-
 textproc/iso8879/Makefile                                | 2 +-
 textproc/jade/Makefile                                   | 2 +-
 textproc/linuxdoc/Makefile                               | 2 +-
 textproc/openfts/Makefile                                | 2 +-
 textproc/openjade/Makefile                               | 2 +-
 textproc/opensp/Makefile                                 | 2 +-
 textproc/p5-Lingua-EN-Inflect-Phrase/Makefile            | 2 +-
 textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile          | 2 +-
 textproc/p5-Net-Groonga-HTTP/Makefile                    | 2 +-
 textproc/p5-Senna/Makefile                               | 2 +-
 textproc/p5-String-Compare-ConstantTime/Makefile         | 2 +-
 textproc/p5-String-Trim/Makefile                         | 2 +-
 textproc/p5-String-Urandom/Makefile                      | 2 +-
 textproc/p5-TeX-Hyphen/Makefile                          | 2 +-
 textproc/p5-Template-Semantic/Makefile                   | 2 +-
 textproc/p5-Test-Groonga/Makefile                        | 2 +-
 textproc/p5-Text-Brew/Makefile                           | 2 +-
 textproc/p5-Text-CSV-Simple/Makefile                     | 2 +-
 textproc/p5-Text-ClearSilver/Makefile                    | 2 +-
 textproc/p5-Text-DHCPLeases/Makefile                     | 2 +-
 textproc/p5-Text-LTSV/Makefile                           | 2 +-
 textproc/p5-Text-MicroMason/Makefile                     | 2 +-
 textproc/p5-Text-MicroTemplate-Extended/Makefile         | 2 +-
 textproc/p5-Text-MicroTemplate/Makefile                  | 2 +-
 textproc/p5-Text-Patch/Makefile                          | 2 +-
 textproc/p5-Text-Pipe/Makefile                           | 2 +-
 textproc/p5-Text-Sass/Makefile                           | 2 +-
 textproc/p5-Text-SimpleTable-AutoWidth/Makefile          | 2 +-
 textproc/p5-Text-VisualWidth/Makefile                    | 2 +-
 textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile          | 2 +-
 textproc/p5-Tiffany/Makefile                             | 2 +-
 textproc/p5-XML-AutoWriter/Makefile                      | 2 +-
 textproc/p5-XML-DOM/Makefile                             | 2 +-
 textproc/p5-XML-OPML-LibXML/Makefile                     | 2 +-
 textproc/p5-XML-Parser/Makefile                          | 2 +-
 textproc/p5-YAML-Tiny-Color/Makefile                     | 2 +-
 textproc/rubygem-charlock_holmes/Makefile                | 2 +-
 textproc/rubygem-ltsv/Makefile                           | 2 +-
 textproc/senna/Makefile                                  | 2 +-
 textproc/sgmlformat/Makefile                             | 2 +-
 textproc/xhtml/Makefile                                  | 2 +-
 www/fswiki/Makefile                                      | 2 +-
 www/mod_asn/Makefile                                     | 2 +-
 www/mod_auth_tkt/Makefile                                | 2 +-
 www/mod_reproxy/Makefile                                 | 2 +-
 www/p5-Amon2-Lite/Makefile                               | 2 +-
 www/p5-Amon2-Plugin-LogDispatch/Makefile                 | 2 +-
 www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile            | 2 +-
 www/p5-Amon2-Plugin-Web-MobileAgent/Makefile             | 2 +-
 www/p5-Amon2/Makefile                                    | 2 +-
 www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile              | 2 +-
 www/p5-AnyEvent-ReverseHTTP/Makefile                     | 2 +-
 www/p5-AnyEvent-SCGI/Makefile                            | 2 +-
 www/p5-Apache-LogFormat-Compiler/Makefile                | 2 +-
 www/p5-Ark/Makefile                                      | 2 +-
 www/p5-CGI-Application-PSGI/Makefile                     | 2 +-
 www/p5-CGI-Compile/Makefile                              | 2 +-
 www/p5-CGI-Emulate-PSGI/Makefile                         | 2 +-
 www/p5-CGI-PSGI/Makefile                                 | 2 +-
 www/p5-CGI-Pager/Makefile                                | 2 +-
 www/p5-CGI-Session/Makefile                              | 2 +-
 www/p5-Catalyst-Engine-PSGI/Makefile                     | 2 +-
 www/p5-Catalyst-Model-CDBI-Plain/Makefile                | 2 +-
 www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile     | 2 +-
 www/p5-Catalyst-View-JSON/Makefile                       | 2 +-
 www/p5-Catalyst-View-REST-XML/Makefile                   | 2 +-
 www/p5-Catalyst-View-XML-Simple/Makefile                 | 2 +-
 www/p5-Cookie-Baker/Makefile                             | 2 +-
 www/p5-Corona/Makefile                                   | 2 +-
 www/p5-Dancer-Plugin-ValidationClass/Makefile            | 2 +-
 www/p5-Dancer-Session-Cookie/Makefile                    | 2 +-
 www/p5-Dancer/Makefile                                   | 2 +-
 www/p5-FCGI-Client/Makefile                              | 2 +-
 www/p5-Facebook-Graph/Makefile                           | 2 +-
 www/p5-Flea/Makefile                                     | 2 +-
 www/p5-Fliggy/Makefile                                   | 2 +-
 www/p5-Furl/Makefile                                     | 2 +-
 www/p5-FurlX-Coro/Makefile                               | 2 +-
 www/p5-GunghoX-FollowLinks/Makefile                      | 2 +-
 www/p5-HTML-ExtractContent/Makefile                      | 2 +-
 www/p5-HTML-FillInForm-Lite/Makefile                     | 2 +-
 www/p5-HTML-Restrict/Makefile                            | 2 +-
 www/p5-HTML-Shakan/Makefile                              | 2 +-
 www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile              | 2 +-
 www/p5-HTML-Template-Pro/Makefile                        | 2 +-
 www/p5-HTML-Template/Makefile                            | 2 +-
 www/p5-HTTP-Engine-Middleware/Makefile                   | 2 +-
 www/p5-HTTP-Engine/Makefile                              | 2 +-
 www/p5-HTTP-Exception/Makefile                           | 2 +-
 www/p5-HTTP-Headers-Fast/Makefile                        | 2 +-
 www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile          | 2 +-
 www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile          | 2 +-
 www/p5-HTTP-Parser-XS/Makefile                           | 2 +-
 www/p5-HTTP-Router/Makefile                              | 2 +-
 www/p5-HTTP-Session-State-MobileAgentID/Makefile         | 2 +-
 www/p5-HTTP-Session-Store-DBI/Makefile                   | 2 +-
 www/p5-HTTP-Session/Makefile                             | 2 +-
 www/p5-HTTP-Session2/Makefile                            | 2 +-
 www/p5-HTTP-WebTest/Makefile                             | 2 +-
 www/p5-HTTPD-Log-Filter/Makefile                         | 2 +-
 www/p5-I18N-AcceptLanguage/Makefile                      | 2 +-
 www/p5-LWP-Authen-OAuth/Makefile                         | 2 +-
 www/p5-LWP-Protocol-PSGI/Makefile                        | 2 +-
 www/p5-Monoceros/Makefile                                | 2 +-
 www/p5-Net-FastCGI/Makefile                              | 2 +-
 www/p5-Net-STF-Client/Makefile                           | 2 +-
 www/p5-POE-Component-Server-PSGI/Makefile                | 2 +-
 www/p5-POEx-Role-PSGIServer/Makefile                     | 2 +-
 www/p5-PSGI/Makefile                                     | 2 +-
 www/p5-Path-Class-URI/Makefile                           | 2 +-
 www/p5-Perlbal-Plugin-PSGI/Makefile                      | 2 +-
 www/p5-Plack-App-Proxy/Makefile                          | 2 +-
 www/p5-Plack-Builder-Conditionals/Makefile               | 2 +-
 www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile             | 2 +-
 www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile       | 2 +-
 www/p5-Plack-Handler-AnyEvent-SCGI/Makefile              | 2 +-
 www/p5-Plack-Handler-CLI/Makefile                        | 2 +-
 www/p5-Plack-Handler-SCGI/Makefile                       | 2 +-
 www/p5-Plack-Middleware-AMF/Makefile                     | 2 +-
 www/p5-Plack-Middleware-AddDefaultCharset/Makefile       | 2 +-
 www/p5-Plack-Middleware-Auth-Digest/Makefile             | 2 +-
 www/p5-Plack-Middleware-AutoRefresh/Makefile             | 2 +-
 www/p5-Plack-Middleware-ConsoleLogger/Makefile           | 2 +-
 www/p5-Plack-Middleware-Debug/Makefile                   | 2 +-
 www/p5-Plack-Middleware-Deflater/Makefile                | 2 +-
 www/p5-Plack-Middleware-File-Sass/Makefile               | 2 +-
 www/p5-Plack-Middleware-Header/Makefile                  | 2 +-
 www/p5-Plack-Middleware-IEnosniff/Makefile               | 2 +-
 www/p5-Plack-Middleware-InteractiveDebugger/Makefile     | 2 +-
 www/p5-Plack-Middleware-JSConcat/Makefile                | 2 +-
 www/p5-Plack-Middleware-MemoryUsage/Makefile             | 2 +-
 www/p5-Plack-Middleware-Precompressed/Makefile           | 2 +-
 www/p5-Plack-Middleware-Reproxy/Makefile                 | 2 +-
 www/p5-Plack-Middleware-ReverseProxy/Makefile            | 2 +-
 www/p5-Plack-Middleware-ServerStatus-Lite/Makefile       | 2 +-
 www/p5-Plack-Middleware-Session/Makefile                 | 2 +-
 www/p5-Plack-Middleware-SocketIO/Makefile                | 2 +-
 www/p5-Plack-Middleware-Status/Makefile                  | 2 +-
 www/p5-Plack-Middleware-Throttle/Makefile                | 2 +-
 www/p5-Plack-Server-Coro/Makefile                        | 2 +-
 www/p5-Plack-Server-POE/Makefile                         | 2 +-
 www/p5-Plack-Server-ReverseHTTP/Makefile                 | 2 +-
 www/p5-Plack/Makefile                                    | 2 +-
 www/p5-Router-Boom/Makefile                              | 2 +-
 www/p5-Router-Simple-Sinatraish/Makefile                 | 2 +-
 www/p5-SOAP-Transport-HTTP-Plack/Makefile                | 2 +-
 www/p5-STF-Dispatcher-PSGI/Makefile                      | 2 +-
 www/p5-Session-Storage-Secure/Makefile                   | 2 +-
 www/p5-Squatting-On-PSGI/Makefile                        | 2 +-
 www/p5-Starlet/Makefile                                  | 2 +-
 www/p5-Starman/Makefile                                  | 2 +-
 www/p5-Task-Plack/Makefile                               | 2 +-
 www/p5-Template-Plugin-Comma/Makefile                    | 2 +-
 www/p5-Template-Plugin-JSON/Makefile                     | 2 +-
 www/p5-Template-Plugin-VMethods/Makefile                 | 2 +-
 www/p5-Template-Stash-AutoEscape/Makefile                | 2 +-
 www/p5-Tenjin/Makefile                                   | 2 +-
 www/p5-Twiggy-TLS/Makefile                               | 2 +-
 www/p5-Twiggy/Makefile                                   | 2 +-
 www/p5-jQuery-File-Upload/Makefile                       | 2 +-
 www/rubygem-acts-as-taggable-on/Makefile                 | 2 +-
 x11-clocks/asclock-xlib/Makefile                         | 2 +-
 420 files changed, 420 insertions(+), 420 deletions(-)

diff --git a/archivers/p5-IO-Zlib/Makefile b/archivers/p5-IO-Zlib/Makefile
index 3c1e1ce8d2da..9643d3624aef 100644
--- a/archivers/p5-IO-Zlib/Makefile
+++ b/archivers/p5-IO-Zlib/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	archivers perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	IO:: style interface to Compress::Zlib
 
 LICENSE=	ART10 GPLv1+
diff --git a/audio/p5-Audio-Ecasound/Makefile b/audio/p5-Audio-Ecasound/Makefile
index 30b4490c9c58..2e6b48a67c7a 100644
--- a/audio/p5-Audio-Ecasound/Makefile
+++ b/audio/p5-Audio-Ecasound/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ecasound sampler, recorder, fx-processor
 
 BUILD_DEPENDS=	libecasoundc-config:audio/ecasound
diff --git a/audio/p5-Net-LibLO/Makefile b/audio/p5-Net-LibLO/Makefile
index 6112071fd452..f5f3d2eb91be 100644
--- a/audio/p5-Net-LibLO/Makefile
+++ b/audio/p5-Net-LibLO/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	audio perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for liblo Lightweight OSC library
 
 LIB_DEPENDS=	liblo.so:audio/liblo
diff --git a/benchmarks/bonnie/Makefile b/benchmarks/bonnie/Makefile
index f048a0b27022..640f08cb0ba4 100644
--- a/benchmarks/bonnie/Makefile
+++ b/benchmarks/bonnie/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.textuality.com/bonnie/
 DISTNAME=	bonnie
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Performance Test of Filesystem I/O
 
 NO_WRKSUBDIR=	yes
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 2140b5182943..dd5357fb04cb 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -4,7 +4,7 @@ DISTVERSION=	8.2.4
 CATEGORIES=	comms
 PKGNAMESUFFIX=	-com
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application that allows multiple users to watch serial consoles
 
 LICENSE=	BSD3CLAUSE
diff --git a/converters/p5-Convert-Moji/Makefile b/converters/p5-Convert-Moji/Makefile
index a9307cf98493..d1322f3ccf33 100644
--- a/converters/p5-Convert-Moji/Makefile
+++ b/converters/p5-Convert-Moji/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to convert objects to alphabets
 
 LICENSE=	ART10 GPLv1+
diff --git a/converters/p5-Data-AMF/Makefile b/converters/p5-Data-AMF/Makefile
index b660c1d992ee..35b0415b397f 100644
--- a/converters/p5-Data-AMF/Makefile
+++ b/converters/p5-Data-AMF/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to serialize, deserialize AMF data
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/converters/p5-JSON/Makefile b/converters/p5-JSON/Makefile
index 89ad9a0f567c..d6b51b7eb6fa 100644
--- a/converters/p5-JSON/Makefile
+++ b/converters/p5-JSON/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to convert to JSON (JavaScript Object Notation)
 
 LICENSE=	ART10 GPLv1+
diff --git a/converters/p5-JSON1/Makefile b/converters/p5-JSON1/Makefile
index 969dda188cfa..2cd4f6ca56e9 100644
--- a/converters/p5-JSON1/Makefile
+++ b/converters/p5-JSON1/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 PKGNAMESUFFIX=	1
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to convert to JSON (JavaScript Object Notation)
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/converters/p5-Unicode-RecursiveDowngrade/Makefile b/converters/p5-Unicode-RecursiveDowngrade/Makefile
index 187ba1c89903..253f23bc615f 100644
--- a/converters/p5-Unicode-RecursiveDowngrade/Makefile
+++ b/converters/p5-Unicode-RecursiveDowngrade/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	converters perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to turn off UTF-8 flags inside of comprex variable
 
 USES=		perl5
diff --git a/databases/p5-Amon2-DBI/Makefile b/databases/p5-Amon2-DBI/Makefile
index 88be3f7cd8da..f71d3c5e4ddd 100644
--- a/databases/p5-Amon2-DBI/Makefile
+++ b/databases/p5-Amon2-DBI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of simple DBI wrapper
 
 RUN_DEPENDS=	\
diff --git a/databases/p5-AnyEvent-DBD-Pg/Makefile b/databases/p5-AnyEvent-DBD-Pg/Makefile
index f86d7ca4af25..7c15695ec9ec 100644
--- a/databases/p5-AnyEvent-DBD-Pg/Makefile
+++ b/databases/p5-AnyEvent-DBD-Pg/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for AnyEvent interface to DBD::Pg async interface
 
 BUILD_DEPENDS=	p5-AnyEvent>=5:devel/p5-AnyEvent \
diff --git a/databases/p5-CGI-Session-Driver-memcached/Makefile b/databases/p5-CGI-Session-Driver-memcached/Makefile
index a6076df0c6fd..a85a6bb16470 100644
--- a/databases/p5-CGI-Session-Driver-memcached/Makefile
+++ b/databases/p5-CGI-Session-Driver-memcached/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for persistent session data in CGI applications
 
 RUN_DEPENDS=	\
diff --git a/databases/p5-Class-DBI-Plugin-Iterator/Makefile b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
index 061be90bdf78..c3b3bd65b41f 100644
--- a/databases/p5-Class-DBI-Plugin-Iterator/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Iterator/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	New iterator for p5-Class-DBI
 
 BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI
diff --git a/databases/p5-Class-DBI-Plugin-Pager/Makefile b/databases/p5-Class-DBI-Plugin-Pager/Makefile
index 441c2980fc44..3a2a53caac4b 100644
--- a/databases/p5-Class-DBI-Plugin-Pager/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Pager/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to paged queries for CDBI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-Class-DBI-Plugin-Senna/Makefile b/databases/p5-Class-DBI-Plugin-Senna/Makefile
index 68b5e0525109..142a93f9f181 100644
--- a/databases/p5-Class-DBI-Plugin-Senna/Makefile
+++ b/databases/p5-Class-DBI-Plugin-Senna/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Add Instant Fulltext Search Capability With Senna to Class::DBI
 
 BUILD_DEPENDS=	p5-Class-DBI>=0:databases/p5-Class-DBI \
diff --git a/databases/p5-DBIx-Class-AsFdat/Makefile b/databases/p5-DBIx-Class-AsFdat/Makefile
index d6d6edb31d26..07f0876a999c 100644
--- a/databases/p5-DBIx-Class-AsFdat/Makefile
+++ b/databases/p5-DBIx-Class-AsFdat/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension like CDBI::Plugin::AsFdat
 
 RUN_DEPENDS=	\
diff --git a/databases/p5-DBIx-Class-DeploymentHandler/Makefile b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
index 9bac55c130c3..e34570f9929d 100644
--- a/databases/p5-DBIx-Class-DeploymentHandler/Makefile
+++ b/databases/p5-DBIx-Class-DeploymentHandler/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for extensible DBIx::Class deployment
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-Class-Fixtures/Makefile b/databases/p5-DBIx-Class-Fixtures/Makefile
index 65ce1bc11241..bc4292fe295a 100644
--- a/databases/p5-DBIx-Class-Fixtures/Makefile
+++ b/databases/p5-DBIx-Class-Fixtures/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SKAUFMAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to use fixtures with DBIx::Class
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
index 5dfd24ba85e4..facba3484336 100644
--- a/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
+++ b/databases/p5-DBIx-Class-InflateColumn-FS/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to {in,de}flate columns to Path::Class::File objects
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Class-Migration/Makefile b/databases/p5-DBIx-Class-Migration/Makefile
index e2e9f005ad16..9fc570f65fc9 100644
--- a/databases/p5-DBIx-Class-Migration/Makefile
+++ b/databases/p5-DBIx-Class-Migration/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to make migrating your DBIx::Class databases easier
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
index 325b047c20c3..3cdbbaf27a49 100644
--- a/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
+++ b/databases/p5-DBIx-Class-Tree-NestedSet/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to manage trees of data using the nested set model
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Class-Tree/Makefile b/databases/p5-DBIx-Class-Tree/Makefile
index 1220da1c10d5..09cd734dddb0 100644
--- a/databases/p5-DBIx-Class-Tree/Makefile
+++ b/databases/p5-DBIx-Class-Tree/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to manipulate and analyze tree structured data
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-Connector/Makefile b/databases/p5-DBIx-Connector/Makefile
index f9b688df0bea..34b9e8125af1 100644
--- a/databases/p5-DBIx-Connector/Makefile
+++ b/databases/p5-DBIx-Connector/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for fast, safe DBI connection management
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-DBHResolver/Makefile b/databases/p5-DBIx-DBHResolver/Makefile
index 2bccbe28f209..36cd383825f3 100644
--- a/databases/p5-DBIx-DBHResolver/Makefile
+++ b/databases/p5-DBIx-DBHResolver/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to resolve DB connection with many database servers
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Inspector/Makefile b/databases/p5-DBIx-Inspector/Makefile
index 64306b25392c..b14a6ea3d8b4 100644
--- a/databases/p5-DBIx-Inspector/Makefile
+++ b/databases/p5-DBIx-Inspector/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to get information from $dbh
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-QueryLog/Makefile b/databases/p5-DBIx-QueryLog/Makefile
index 0438580beec4..f41694eda32c 100644
--- a/databases/p5-DBIx-QueryLog/Makefile
+++ b/databases/p5-DBIx-QueryLog/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for logging queries for DBI
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
index b008991c7641..28772b47840e 100644
--- a/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
+++ b/databases/p5-DBIx-Skinny-InflateColumn-DateTime/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to inflate/deflate DateTime for DBIx::Skinny
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
index 241a150d06fa..0725d428241c 100644
--- a/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
+++ b/databases/p5-DBIx-Skinny-Mixin-DBHResolver/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of DBIx::DBHResolver mixin for DBIx::Skinny
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Skinny-Pager/Makefile b/databases/p5-DBIx-Skinny-Pager/Makefile
index 5baf4f6e964b..bff2d0a04c19 100644
--- a/databases/p5-DBIx-Skinny-Pager/Makefile
+++ b/databases/p5-DBIx-Skinny-Pager/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of resultset pager for DBIx::Skinny
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
index 19417513b5cd..1aa95bb5d7e4 100644
--- a/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Skinny-Schema-Loader/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOYA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to load schema for DBIx::Skinny
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-DBIx-Skinny/Makefile b/databases/p5-DBIx-Skinny/Makefile
index a2ccbf2d5842..e3f16ec17299 100644
--- a/databases/p5-DBIx-Skinny/Makefile
+++ b/databases/p5-DBIx-Skinny/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple DBI wrapper/ORMapper
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-DBIx-TransactionManager/Makefile b/databases/p5-DBIx-TransactionManager/Makefile
index 544ac0927fee..d0f1e675121c 100644
--- a/databases/p5-DBIx-TransactionManager/Makefile
+++ b/databases/p5-DBIx-TransactionManager/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for database transaction handling
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-GitDDL-Migrator/Makefile b/databases/p5-GitDDL-Migrator/Makefile
index da526ea59da5..7b324e1c0392 100644
--- a/databases/p5-GitDDL-Migrator/Makefile
+++ b/databases/p5-GitDDL-Migrator/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SONGMU
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to extended p5-GitDDL
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-GitDDL/Makefile b/databases/p5-GitDDL/Makefile
index 4d5eac005938..5a78e9bea482 100644
--- a/databases/p5-GitDDL/Makefile
+++ b/databases/p5-GitDDL/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TYPESTER
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for database migration utility by git managed sql
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-RedisDB-Parser/Makefile b/databases/p5-RedisDB-Parser/Makefile
index fcfb668b6d06..3388482b8b12 100644
--- a/databases/p5-RedisDB-Parser/Makefile
+++ b/databases/p5-RedisDB-Parser/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Redis protocol parser
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-RedisDB/Makefile b/databases/p5-RedisDB/Makefile
index c2013e9c681a..0ebb900aa27a 100644
--- a/databases/p5-RedisDB/Makefile
+++ b/databases/p5-RedisDB/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to access redis database
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
index 89f4ef65ec00..6b835e73f0b1 100644
--- a/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
+++ b/databases/p5-SQL-Abstract-Plugin-InsertMulti/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to add bulk insert for SQL::Abstract
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-SQL-Maker/Makefile b/databases/p5-SQL-Maker/Makefile
index 72c72fba44c9..276cf126a124 100644
--- a/databases/p5-SQL-Maker/Makefile
+++ b/databases/p5-SQL-Maker/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for yet another SQL builder
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-Search-Namazu/Makefile b/databases/p5-Search-Namazu/Makefile
index 197cc986533a..4898c7da2efc 100644
--- a/databases/p5-Search-Namazu/Makefile
+++ b/databases/p5-Search-Namazu/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Namazu library module for perl
 
 LIB_DEPENDS=	libnmz.so:databases/namazu2
diff --git a/databases/p5-Teng/Makefile b/databases/p5-Teng/Makefile
index db7434625bda..04fed884f402 100644
--- a/databases/p5-Teng/Makefile
+++ b/databases/p5-Teng/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SATOH
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple DBI wrapper/ORMapper
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-Test-Fixture-DBI/Makefile b/databases/p5-Test-Fixture-DBI/Makefile
index ae144d38a0a6..5a44cdef226d 100644
--- a/databases/p5-Test-Fixture-DBI/Makefile
+++ b/databases/p5-Test-Fixture-DBI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to load fixture data into database
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-Test-mysqld/Makefile b/databases/p5-Test-mysqld/Makefile
index 137149e925b4..03c20274dbdf 100644
--- a/databases/p5-Test-mysqld/Makefile
+++ b/databases/p5-Test-mysqld/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for mysqld test runner
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/databases/p5-Test-postgresql/Makefile b/databases/p5-Test-postgresql/Makefile
index de0a23ab8ba8..de1d5b5e9a46 100644
--- a/databases/p5-Test-postgresql/Makefile
+++ b/databases/p5-Test-postgresql/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of postgresql runner for tests
 
 LICENSE=	ART10 GPLv1+
diff --git a/databases/p5-TokyoCabinet/Makefile b/databases/p5-TokyoCabinet/Makefile
index 3553fcc20bf5..67af91841c8d 100644
--- a/databases/p5-TokyoCabinet/Makefile
+++ b/databases/p5-TokyoCabinet/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	LOCAL/kuriyama \
 PKGNAMEPREFIX=	p5-
 DISTNAME=	tokyocabinet-perl-${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for TokyoCabinet
 
 LIB_DEPENDS=	libtokyocabinet.so:databases/tokyocabinet
diff --git a/databases/p5-tokyotyrant/Makefile b/databases/p5-tokyotyrant/Makefile
index 13cfac63ea4b..d4a1c7c7f9cb 100644
--- a/databases/p5-tokyotyrant/Makefile
+++ b/databases/p5-tokyotyrant/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	https://dbmx.net/${PORTNAME}/perlpkg/
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-perl-${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 interface to the TokyoTyrant
 
 BUILD_DEPENDS=	tokyotyrant>=1.1.40:databases/tokyotyrant
diff --git a/databases/tokyocabinet/Makefile b/databases/tokyocabinet/Makefile
index 3818bb5fc299..ffd67b53d52d 100644
--- a/databases/tokyocabinet/Makefile
+++ b/databases/tokyocabinet/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	databases
 MASTER_SITES=	LOCAL/kuriyama \
 		https://dbmx.net/${PORTNAME}/
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modern implementation of DBM
 
 LICENSE=	LGPL21
diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile
index a169f9c6119e..8059879fba1a 100644
--- a/deskutils/howm/Makefile
+++ b/deskutils/howm/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	deskutils
 MASTER_SITES=	http://howm.sourceforge.jp/a/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Write fragmentarily and read collectively
 
 LICENSE=	GPLv2+
diff --git a/devel/cpan-upload-http/Makefile b/devel/cpan-upload-http/Makefile
index fcb8b8f31082..b0b141a6a1c1 100644
--- a/devel/cpan-upload-http/Makefile
+++ b/devel/cpan-upload-http/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BRADFITZ
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl script to upload one or more files to CPAN, using PAUSE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/flex-sdk/Makefile b/devel/flex-sdk/Makefile
index b87d08c010b4..cbd86f5829cb 100644
--- a/devel/flex-sdk/Makefile
+++ b/devel/flex-sdk/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel java
 MASTER_SITES=	http://fpdownload.adobe.com/pub/flex/sdk/builds/flex4.6/
 DISTNAME=	flex_sdk_${PORTVERSION}_mpl
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adobe Flex SDK
 
 CONFLICTS=	ja-flex-sdk-2.* flex-sdk2-2.* flex-sdk3-3.*
diff --git a/devel/p5-ARGV-Struct/Makefile b/devel/p5-ARGV-Struct/Makefile
index a9223b8e989f..3de223336eb4 100644
--- a/devel/p5-ARGV-Struct/Makefile
+++ b/devel/p5-ARGV-Struct/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JLMARTIN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parse complex data structures passed in ARGV
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Any-Moose/Makefile b/devel/p5-Any-Moose/Makefile
index 99dcbcebb9c4..1a29e1720eb2 100644
--- a/devel/p5-Any-Moose/Makefile
+++ b/devel/p5-Any-Moose/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for/to use Moose or Mouse modules
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-AnyEvent-Filesys-Notify/Makefile b/devel/p5-AnyEvent-Filesys-Notify/Makefile
index ae50f9be7b33..4cee01de17e1 100644
--- a/devel/p5-AnyEvent-Filesys-Notify/Makefile
+++ b/devel/p5-AnyEvent-Filesys-Notify/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MGRIMES
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for AnyEvent compat to monitor file/dir changes
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-AnyEvent-MessagePack/Makefile b/devel/p5-AnyEvent-MessagePack/Makefile
index 093a80609613..7c97d3592046 100644
--- a/devel/p5-AnyEvent-MessagePack/Makefile
+++ b/devel/p5-AnyEvent-MessagePack/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of AnyEvent for MessagePack
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-App-FatPacker/Makefile b/devel/p5-App-FatPacker/Makefile
index 388276ebe4c2..2733e307a907 100644
--- a/devel/p5-App-FatPacker/Makefile
+++ b/devel/p5-App-FatPacker/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to pack your dependencies onto your script file
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-App-cpanminus/Makefile b/devel/p5-App-cpanminus/Makefile
index 34e6656b1ffe..3c069ccefb28 100644
--- a/devel/p5-App-cpanminus/Makefile
+++ b/devel/p5-App-cpanminus/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to get, unpack, build, and install modules from CPAN
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-App-scan_prereqs_cpanfile/Makefile b/devel/p5-App-scan_prereqs_cpanfile/Makefile
index 99d95bb1e196..2630c72aab60 100644
--- a/devel/p5-App-scan_prereqs_cpanfile/Makefile
+++ b/devel/p5-App-scan_prereqs_cpanfile/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for scanning prerequisite modules to generate cpanfile
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-B-Compiling/Makefile b/devel/p5-B-Compiling/Makefile
index 576cde520996..2fce14f3e62c 100644
--- a/devel/p5-B-Compiling/Makefile
+++ b/devel/p5-B-Compiling/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to expose PL_compiling to perl
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
index 182e655c4baf..0a6be6d309dd 100644
--- a/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
+++ b/devel/p5-B-Hooks-OP-Check-EntersubForCV/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to invoke callback on construction of entersub OPs
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-B-Size2/Makefile b/devel/p5-B-Size2/Makefile
index 461db81063fb..4dd654b067bf 100644
--- a/devel/p5-B-Size2/Makefile
+++ b/devel/p5-B-Size2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to measure size of Perl OPs and SVs
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-BSD-devstat/Makefile b/devel/p5-BSD-devstat/Makefile
index ab48aed11aad..2073e5dc67fd 100644
--- a/devel/p5-BSD-devstat/Makefile
+++ b/devel/p5-BSD-devstat/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of devstat(3) API
 
 USES=		perl5
diff --git a/devel/p5-CHI/Makefile b/devel/p5-CHI/Makefile
index 211fd5b1348b..8d2b9af8d2f0 100644
--- a/devel/p5-CHI/Makefile
+++ b/devel/p5-CHI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITE_SUBDIR=	CPAN:HAARG
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-0.60
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for unified cache interface
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Calendar-Simple/Makefile b/devel/p5-Calendar-Simple/Makefile
index 2742a21cb959..f7fae1b1a28b 100644
--- a/devel/p5-Calendar-Simple/Makefile
+++ b/devel/p5-Calendar-Simple/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAVECROSS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to create simple calendars
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Carp-Always/Makefile b/devel/p5-Carp-Always/Makefile
index db6c55e370ba..fa972bfb11ae 100644
--- a/devel/p5-Carp-Always/Makefile
+++ b/devel/p5-Carp-Always/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to warn and die noisily with stack backtraces
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Carp-Datum/Makefile b/devel/p5-Carp-Datum/Makefile
index e6fa8387a8d8..e2649380519a 100644
--- a/devel/p5-Carp-Datum/Makefile
+++ b/devel/p5-Carp-Datum/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Debugging And Tracing Ultimate Module
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Class-Accessor-Constructor/Makefile b/devel/p5-Class-Accessor-Constructor/Makefile
index 231e356a53cd..a5940ca38cd7 100644
--- a/devel/p5-Class-Accessor-Constructor/Makefile
+++ b/devel/p5-Class-Accessor-Constructor/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for constructor generator
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Class-Forward/Makefile b/devel/p5-Class-Forward/Makefile
index 787da8c27561..61f3ffe92b9f 100644
--- a/devel/p5-Class-Forward/Makefile
+++ b/devel/p5-Class-Forward/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for class dispatcher that handles namespaces like paths
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Class-Method-Modifiers-Fast/Makefile b/devel/p5-Class-Method-Modifiers-Fast/Makefile
index 880d3889c429..6418f6497e6e 100644
--- a/devel/p5-Class-Method-Modifiers-Fast/Makefile
+++ b/devel/p5-Class-Method-Modifiers-Fast/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to provide Moose-like method modifiers
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Class-MethodMapper/Makefile b/devel/p5-Class-MethodMapper/Makefile
index 34a7fb33d4bc..0438412315b0 100644
--- a/devel/p5-Class-MethodMapper/Makefile
+++ b/devel/p5-Class-MethodMapper/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for abstract Class wrapper for AutoLoader
 
 USES=		perl5
diff --git a/devel/p5-Class-Tiny/Makefile b/devel/p5-Class-Tiny/Makefile
index 5620fc8d8f30..5c06deb9daed 100644
--- a/devel/p5-Class-Tiny/Makefile
+++ b/devel/p5-Class-Tiny/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for minimalist class construction
 
 LICENSE=	APACHE20
diff --git a/devel/p5-Compiler-Lexer/Makefile b/devel/p5-Compiler-Lexer/Makefile
index 71e6e6702123..df91c7d22139 100644
--- a/devel/p5-Compiler-Lexer/Makefile
+++ b/devel/p5-Compiler-Lexer/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for lexical analyzer
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Config-MySQL/Makefile b/devel/p5-Config-MySQL/Makefile
index 158c20313616..b0b3d760a856 100644
--- a/devel/p5-Config-MySQL/Makefile
+++ b/devel/p5-Config-MySQL/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to read/write MySQL-style configuration files
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Data-Inherited/Makefile b/devel/p5-Data-Inherited/Makefile
index 28579b7c79fd..341ec1ba4089 100644
--- a/devel/p5-Data-Inherited/Makefile
+++ b/devel/p5-Data-Inherited/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for hierarchy-wide accumulation of list/hash results
 
 USES=		perl5
diff --git a/devel/p5-Data-Localize/Makefile b/devel/p5-Data-Localize/Makefile
index 28a366aed8c0..0110fa087f30 100644
--- a/devel/p5-Data-Localize/Makefile
+++ b/devel/p5-Data-Localize/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for alternate data localization API
 
 LICENSE=	MIT
diff --git a/devel/p5-Data-MessagePack-Stream/Makefile b/devel/p5-Data-MessagePack-Stream/Makefile
index 54fe0f6aada8..daf1eb6b5eb4 100644
--- a/devel/p5-Data-MessagePack-Stream/Makefile
+++ b/devel/p5-Data-MessagePack-Stream/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for yet another messagepack streaming deserializer
 
 BROKEN_mips=		fails to build: atomic operations are not found
diff --git a/devel/p5-Data-MessagePack/Makefile b/devel/p5-Data-MessagePack/Makefile
index 4cbd7ea94da8..d99d38abff73 100644
--- a/devel/p5-Data-MessagePack/Makefile
+++ b/devel/p5-Data-MessagePack/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for MessagePack
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Data-Model/Makefile b/devel/p5-Data-Model/Makefile
index 276c6490d15e..b8ce1d5f9381 100644
--- a/devel/p5-Data-Model/Makefile
+++ b/devel/p5-Data-Model/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for model interface which had more data sources unified
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Data-Page-NoTotalEntries/Makefile b/devel/p5-Data-Page-NoTotalEntries/Makefile
index 4b9e9e3c714a..8864e89d95d2 100644
--- a/devel/p5-Data-Page-NoTotalEntries/Makefile
+++ b/devel/p5-Data-Page-NoTotalEntries/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for paging results without total entries
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Data-Recursive-Encode/Makefile b/devel/p5-Data-Recursive-Encode/Makefile
index 242996b62e79..1d23e7ac0efa 100644
--- a/devel/p5-Data-Recursive-Encode/Makefile
+++ b/devel/p5-Data-Recursive-Encode/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to encode/decode values in a structure
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Data-SExpression/Makefile b/devel/p5-Data-SExpression/Makefile
index 4cb0aa66c78e..a3c28c55a2ce 100644
--- a/devel/p5-Data-SExpression/Makefile
+++ b/devel/p5-Data-SExpression/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parse lisp S-expressions into perl data structures
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Data-Util/Makefile b/devel/p5-Data-Util/Makefile
index c8a3e0170728..e1b655895802 100644
--- a/devel/p5-Data-Util/Makefile
+++ b/devel/p5-Data-Util/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for utilities for data and data types
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Data-Visitor-Encode/Makefile b/devel/p5-Data-Visitor-Encode/Makefile
index c36cff4d9806..4871680ce56a 100644
--- a/devel/p5-Data-Visitor-Encode/Makefile
+++ b/devel/p5-Data-Visitor-Encode/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to encode/decode values in a structure
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Devel-BeginLift/Makefile b/devel/p5-Devel-BeginLift/Makefile
index 545181cd5235..1eb02e388aea 100644
--- a/devel/p5-Devel-BeginLift/Makefile
+++ b/devel/p5-Devel-BeginLift/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to make selected sub calls evaluate at compile time
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
diff --git a/devel/p5-Devel-Caller-Perl/Makefile b/devel/p5-Devel-Caller-Perl/Makefile
index 1d1293c98dee..a0e7014b0804 100644
--- a/devel/p5-Devel-Caller-Perl/Makefile
+++ b/devel/p5-Devel-Caller-Perl/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to implement Devel::Caller with Perl only
 
 USES=		perl5
diff --git a/devel/p5-Devel-CoreStack/Makefile b/devel/p5-Devel-CoreStack/Makefile
index b4e1f5c45c68..8c1baad2285b 100644
--- a/devel/p5-Devel-CoreStack/Makefile
+++ b/devel/p5-Devel-CoreStack/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module that generates a stack dump from a core file
 
 USES=		perl5
diff --git a/devel/p5-Devel-Cover-Report-Clover/Makefile b/devel/p5-Devel-Cover-Report-Clover/Makefile
index 9dee6cdf0100..ead6520eb79e 100644
--- a/devel/p5-Devel-Cover-Report-Clover/Makefile
+++ b/devel/p5-Devel-Cover-Report-Clover/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Clover reporting of coverage statistics
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Devel-Declare-Parser/Makefile b/devel/p5-Devel-Declare-Parser/Makefile
index 8f654f40ab09..a8f89e5ef174 100644
--- a/devel/p5-Devel-Declare-Parser/Makefile
+++ b/devel/p5-Devel-Declare-Parser/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for higher level interface to Devel-Declare
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Devel-KYTProf/Makefile b/devel/p5-Devel-KYTProf/Makefile
index eefbf0a5025b..d057a8d900d7 100644
--- a/devel/p5-Devel-KYTProf/Makefile
+++ b/devel/p5-Devel-KYTProf/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple profiler
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Devel-StackTrace-AsHTML/Makefile b/devel/p5-Devel-StackTrace-AsHTML/Makefile
index 295805af55ce..8b5825694eaa 100644
--- a/devel/p5-Devel-StackTrace-AsHTML/Makefile
+++ b/devel/p5-Devel-StackTrace-AsHTML/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to display stack trace in HTML
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Devel-StackTrace-WithLexicals/Makefile b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
index 4f16a0a35af0..c18a6dd6f83e 100644
--- a/devel/p5-Devel-StackTrace-WithLexicals/Makefile
+++ b/devel/p5-Devel-StackTrace-WithLexicals/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Devel::StackTrace + PadWalker
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Dist-Metadata/Makefile b/devel/p5-Dist-Metadata/Makefile
index 43ec0c5491ed..1d763029436a 100644
--- a/devel/p5-Dist-Metadata/Makefile
+++ b/devel/p5-Dist-Metadata/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for information about a perl module distribution
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Eval-WithLexicals/Makefile b/devel/p5-Eval-WithLexicals/Makefile
index 20f483ccdcd1..3e949eaf6c7b 100644
--- a/devel/p5-Eval-WithLexicals/Makefile
+++ b/devel/p5-Eval-WithLexicals/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for pure perl eval with persistent lexical variables
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Exporter-Declare/Makefile b/devel/p5-Exporter-Declare/Makefile
index 406e5ab46b0c..024e2c13ff61 100644
--- a/devel/p5-Exporter-Declare/Makefile
+++ b/devel/p5-Exporter-Declare/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for exporting done right
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-ExtUtils-Install/Makefile b/devel/p5-ExtUtils-Install/Makefile
index 40d5e93ce64b..d5474e7a6c56 100644
--- a/devel/p5-ExtUtils-Install/Makefile
+++ b/devel/p5-ExtUtils-Install/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to install files from here to there
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Fennec-Lite/Makefile b/devel/p5-Fennec-Lite/Makefile
index bbeee88c1366..1bed72f0d56b 100644
--- a/devel/p5-Fennec-Lite/Makefile
+++ b/devel/p5-Fennec-Lite/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for minimalist Fennec, the commonly used bits
 
 USES=		perl5
diff --git a/devel/p5-File-ShareDir-ProjectDistDir/Makefile b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
index 1bc51d1d8274..5dcc83e82da7 100644
--- a/devel/p5-File-ShareDir-ProjectDistDir/Makefile
+++ b/devel/p5-File-ShareDir-ProjectDistDir/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for set-and-forget using a directory in projects root
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-File-Spec-Native/Makefile b/devel/p5-File-Spec-Native/Makefile
index 34bd47b06a76..0781761f66ac 100644
--- a/devel/p5-File-Spec-Native/Makefile
+++ b/devel/p5-File-Spec-Native/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for native OS implementation of File::Spec
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-File-Sync/Makefile b/devel/p5-File-Sync/Makefile
index 2d0f3417e6e9..9d0526fbbe0f 100644
--- a/devel/p5-File-Sync/Makefile
+++ b/devel/p5-File-Sync/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module interface to the UNIX sync(2) and POSIX.1b fsync(2)
 
 USES=		perl5
diff --git a/devel/p5-File-Tail/Makefile b/devel/p5-File-Tail/Makefile
index b5e24e6939af..e56a0e19040d 100644
--- a/devel/p5-File-Tail/Makefile
+++ b/devel/p5-File-Tail/Makefile
@@ -6,7 +6,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl Module to read the end of a file as it's appended to
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Filesys-Notify-KQueue/Makefile b/devel/p5-Filesys-Notify-KQueue/Makefile
index c01933ee5abe..ff8a436965f6 100644
--- a/devel/p5-Filesys-Notify-KQueue/Makefile
+++ b/devel/p5-Filesys-Notify-KQueue/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to wrap IO::KQueue for watching file system
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Filesys-Notify-Simple/Makefile b/devel/p5-Filesys-Notify-Simple/Makefile
index 44b9cceaf0c0..f9ce3a5af788 100644
--- a/devel/p5-Filesys-Notify-Simple/Makefile
+++ b/devel/p5-Filesys-Notify-Simple/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple and dumb file system watcher
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-FindBin-libs/Makefile b/devel/p5-FindBin-libs/Makefile
index 12a416de77a5..8a19eac53bd5 100644
--- a/devel/p5-FindBin-libs/Makefile
+++ b/devel/p5-FindBin-libs/Makefile
@@ -7,7 +7,7 @@ MASTER_SITE_SUBDIR=	CPAN:LEMBARK
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to locate and use lib directories
 
 USES=		perl5
diff --git a/devel/p5-Hash-MoreUtils/Makefile b/devel/p5-Hash-MoreUtils/Makefile
index f623aa398526..f684fa0b27da 100644
--- a/devel/p5-Hash-MoreUtils/Makefile
+++ b/devel/p5-Hash-MoreUtils/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to provide the stuff missing in Hash::Util
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Hash-MultiValue/Makefile b/devel/p5-Hash-MultiValue/Makefile
index 4af2d59950d5..6f1bbebc5481 100644
--- a/devel/p5-Hash-MultiValue/Makefile
+++ b/devel/p5-Hash-MultiValue/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to store multiple values per key
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-IO-Callback/Makefile b/devel/p5-IO-Callback/Makefile
index 74b37f090c3a..0f97f8290a91 100644
--- a/devel/p5-IO-Callback/Makefile
+++ b/devel/p5-IO-Callback/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to emulate file interface for a code reference
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-IO-FDPass/Makefile b/devel/p5-IO-FDPass/Makefile
index 8e7d00333984..258f3cb56356 100644
--- a/devel/p5-IO-FDPass/Makefile
+++ b/devel/p5-IO-FDPass/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to pass a file descriptor over a socket
 
 BUILD_DEPENDS=	p5-Canary-Stability>0:devel/p5-Canary-Stability
diff --git a/devel/p5-IO-File-AtomicChange/Makefile b/devel/p5-IO-File-AtomicChange/Makefile
index 60b54aa543c4..9dcfc69e2bda 100644
--- a/devel/p5-IO-File-AtomicChange/Makefile
+++ b/devel/p5-IO-File-AtomicChange/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to change content of a file atomically
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-IO-KQueue/Makefile b/devel/p5-IO-KQueue/Makefile
index aae3df55c89e..3e6186b24e8a 100644
--- a/devel/p5-IO-KQueue/Makefile
+++ b/devel/p5-IO-KQueue/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to the BSD kqueue system call
 
 LICENSE=	ART10 GPLv2
diff --git a/devel/p5-IPC-System-Simple/Makefile b/devel/p5-IPC-System-Simple/Makefile
index 35794aa6a968..9fb6ee2aee82 100644
--- a/devel/p5-IPC-System-Simple/Makefile
+++ b/devel/p5-IPC-System-Simple/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to run commands simply with detailed diagnostics
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-JSON-Pointer/Makefile b/devel/p5-JSON-Pointer/Makefile
index 223cc3be43c5..0d99fb681d4f 100644
--- a/devel/p5-JSON-Pointer/Makefile
+++ b/devel/p5-JSON-Pointer/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of JSON Pointer (RFC6901)
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Jonk/Makefile b/devel/p5-Jonk/Makefile
index 8e7f8bf34e7c..6e99ed0f6b51 100644
--- a/devel/p5-Jonk/Makefile
+++ b/devel/p5-Jonk/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple job tank manager
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Log-Any-Adapter-Dispatch/Makefile b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
index 8fe06117b72d..66ae4ba0243c 100644
--- a/devel/p5-Log-Any-Adapter-Dispatch/Makefile
+++ b/devel/p5-Log-Any-Adapter-Dispatch/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for adapter to use Log::Dispatch with Log::Any
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Log-Any/Makefile b/devel/p5-Log-Any/Makefile
index 38fba6be85d7..29543c7fd449 100644
--- a/devel/p5-Log-Any/Makefile
+++ b/devel/p5-Log-Any/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:PREACTION
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to bring loggers and listeners together
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Log-Contextual/Makefile b/devel/p5-Log-Contextual/Makefile
index a603f514502e..5d2a79a32818 100644
--- a/devel/p5-Log-Contextual/Makefile
+++ b/devel/p5-Log-Contextual/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple logging interface with a contextual log
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Log-Dispatch-Colorful/Makefile b/devel/p5-Log-Dispatch-Colorful/Makefile
index 98894789d2dc..554091b1bf49 100644
--- a/devel/p5-Log-Dispatch-Colorful/Makefile
+++ b/devel/p5-Log-Dispatch-Colorful/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for logging to screen
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Log-Dispatch-Screen-Color/Makefile b/devel/p5-Log-Dispatch-Screen-Color/Makefile
index 7c937364a1f5..51c8f74e9d2d 100644
--- a/devel/p5-Log-Dispatch-Screen-Color/Makefile
+++ b/devel/p5-Log-Dispatch-Screen-Color/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to support color for Log::Dispatch::Screen
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Log-Dump/Makefile b/devel/p5-Log-Dump/Makefile
index 687d38455e08..f8c503ed144a 100644
--- a/devel/p5-Log-Dump/Makefile
+++ b/devel/p5-Log-Dump/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of simple logger mainly for debugging
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Meta-Builder/Makefile b/devel/p5-Meta-Builder/Makefile
index 8190a7fb0429..b06f71728b8f 100644
--- a/devel/p5-Meta-Builder/Makefile
+++ b/devel/p5-Meta-Builder/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for creating Meta objects to track custom metrics
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Module-Collect/Makefile b/devel/p5-Module-Collect/Makefile
index 1d1f27d768b9..38e1b36c1b8d 100644
--- a/devel/p5-Module-Collect/Makefile
+++ b/devel/p5-Module-Collect/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to collect module files from some directories
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Module-Functions/Makefile b/devel/p5-Module-Functions/Makefile
index daac2c58c3f6..ca2b055b45dc 100644
--- a/devel/p5-Module-Functions/Makefile
+++ b/devel/p5-Module-Functions/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to get function list from package
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Module-Install-AuthorRequires/Makefile b/devel/p5-Module-Install-AuthorRequires/Makefile
index 77e1b1c926c9..a1beb4e9a790 100644
--- a/devel/p5-Module-Install-AuthorRequires/Makefile
+++ b/devel/p5-Module-Install-AuthorRequires/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to declare author-only dependencies
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Module-Install-AuthorTests/Makefile b/devel/p5-Module-Install-AuthorTests/Makefile
index 28635b84ec32..a6bfe573d739 100644
--- a/devel/p5-Module-Install-AuthorTests/Makefile
+++ b/devel/p5-Module-Install-AuthorTests/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to designate tests only run by module authors
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Module-Install-Repository/Makefile b/devel/p5-Module-Install-Repository/Makefile
index 151540e79d54..b3eda179ae9b 100644
--- a/devel/p5-Module-Install-Repository/Makefile
+++ b/devel/p5-Module-Install-Repository/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to set repository URL from svn/svk/Git checkout
 
 USES=		perl5
diff --git a/devel/p5-Module-Metadata/Makefile b/devel/p5-Module-Metadata/Makefile
index 56e7bfb1cc09..a6f61227ece6 100644
--- a/devel/p5-Module-Metadata/Makefile
+++ b/devel/p5-Module-Metadata/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ETHER
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to gather package information from perl module files
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Module-Reader/Makefile b/devel/p5-Module-Reader/Makefile
index 46b00fbb68f4..cd0c014e5e7b 100644
--- a/devel/p5-Module-Reader/Makefile
+++ b/devel/p5-Module-Reader/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to read the source of module like perl does
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Module-Setup/Makefile b/devel/p5-Module-Setup/Makefile
index d1137d86aa54..cff70fd8b72c 100644
--- a/devel/p5-Module-Setup/Makefile
+++ b/devel/p5-Module-Setup/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for a simple module maker
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Module-Versions/Makefile b/devel/p5-Module-Versions/Makefile
index 07f67fc10bab..41f1155950bc 100644
--- a/devel/p5-Module-Versions/Makefile
+++ b/devel/p5-Module-Versions/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to handle versions of loaded modules
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-MooX-late/Makefile b/devel/p5-MooX-late/Makefile
index 44c84c8f1eeb..00e15c3160a1 100644
--- a/devel/p5-MooX-late/Makefile
+++ b/devel/p5-MooX-late/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to easily translate Moose code to Moo
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-MooseX-CompileTime-Traits/Makefile b/devel/p5-MooseX-CompileTime-Traits/Makefile
index 75da02bdb4e7..a0e55a50e357 100644
--- a/devel/p5-MooseX-CompileTime-Traits/Makefile
+++ b/devel/p5-MooseX-CompileTime-Traits/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to allow compile time traits for classes/roles
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-MooseX-ConfigFromFile/Makefile b/devel/p5-MooseX-ConfigFromFile/Makefile
index a4b498f200d4..e6b8a9dc2fcc 100644
--- a/devel/p5-MooseX-ConfigFromFile/Makefile
+++ b/devel/p5-MooseX-ConfigFromFile/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to abstract Moose role attribute setting from file
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-MooseX-Types-Path-Tiny/Makefile b/devel/p5-MooseX-Types-Path-Tiny/Makefile
index 95767a11954e..3ffe7f3cc5f0 100644
--- a/devel/p5-MooseX-Types-Path-Tiny/Makefile
+++ b/devel/p5-MooseX-Types-Path-Tiny/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Path::Tiny types and coercions for Moose
 
 LICENSE=	APACHE20
diff --git a/devel/p5-MooseX-Types-Stringlike/Makefile b/devel/p5-MooseX-Types-Stringlike/Makefile
index 6cbeee350f0a..93448b711ad7 100644
--- a/devel/p5-MooseX-Types-Stringlike/Makefile
+++ b/devel/p5-MooseX-Types-Stringlike/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Moose type constraints for string-like objects
 
 LICENSE=	APACHE20
diff --git a/devel/p5-MouseX-AttributeHelpers/Makefile b/devel/p5-MouseX-AttributeHelpers/Makefile
index cc2a87aff77f..51ca7254f5e4 100644
--- a/devel/p5-MouseX-AttributeHelpers/Makefile
+++ b/devel/p5-MouseX-AttributeHelpers/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MASAKI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to extend your attribute interfaces
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-MouseX-Getopt/Makefile b/devel/p5-MouseX-Getopt/Makefile
index 0e63e3f8384c..5ddc7c6299a1 100644
--- a/devel/p5-MouseX-Getopt/Makefile
+++ b/devel/p5-MouseX-Getopt/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/00$//}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for a Mouse role to process command line options
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-MouseX-Types/Makefile b/devel/p5-MouseX-Types/Makefile
index 14d2fa8f9dcc..6438dea58c6f 100644
--- a/devel/p5-MouseX-Types/Makefile
+++ b/devel/p5-MouseX-Types/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to organize your Mouse types in libraries
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-OrePAN2/Makefile b/devel/p5-OrePAN2/Makefile
index 2f69277a7d07..edae7ec6d1f7 100644
--- a/devel/p5-OrePAN2/Makefile
+++ b/devel/p5-OrePAN2/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OALDERS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for yet another DarkPAN manager
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Ouch/Makefile b/devel/p5-Ouch/Makefile
index 0602800a47d2..cb2b925ddc4b 100644
--- a/devel/p5-Ouch/Makefile
+++ b/devel/p5-Ouch/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RIZEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for exceptions that don't hurt
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-POEx-Role-SessionInstantiation/Makefile b/devel/p5-POEx-Role-SessionInstantiation/Makefile
index afa2fa13456c..5b88b249f737 100644
--- a/devel/p5-POEx-Role-SessionInstantiation/Makefile
+++ b/devel/p5-POEx-Role-SessionInstantiation/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Moose role for turning objects into POE sessions
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-POEx-Role-Streaming/Makefile b/devel/p5-POEx-Role-Streaming/Makefile
index f02ed150f9da..c7767e13ce70 100644
--- a/devel/p5-POEx-Role-Streaming/Makefile
+++ b/devel/p5-POEx-Role-Streaming/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for streaming from one filehandle to another
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-POEx-Types/Makefile b/devel/p5-POEx-Types/Makefile
index 700fd1e0cc56..c032bc7fe947 100644
--- a/devel/p5-POEx-Types/Makefile
+++ b/devel/p5-POEx-Types/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to provide MooseX::Types types for modern POE
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-POSIX-strftime-Compiler/Makefile b/devel/p5-POSIX-strftime-Compiler/Makefile
index f60e4915fe3b..e874755bcfe0 100644
--- a/devel/p5-POSIX-strftime-Compiler/Makefile
+++ b/devel/p5-POSIX-strftime-Compiler/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for glibc compatible strftime for loggers/servers
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Parallel-Async/Makefile b/devel/p5-Parallel-Async/Makefile
index af261dc63254..c21620b3d622 100644
--- a/devel/p5-Parallel-Async/Makefile
+++ b/devel/p5-Parallel-Async/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to run parallel task with fork to simple
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Parallel-Scoreboard/Makefile b/devel/p5-Parallel-Scoreboard/Makefile
index a5971a756b1b..db697a8d66c5 100644
--- a/devel/p5-Parallel-Scoreboard/Makefile
+++ b/devel/p5-Parallel-Scoreboard/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of scoreboard for monitoring status of many workers
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Parse-LocalDistribution/Makefile b/devel/p5-Parse-LocalDistribution/Makefile
index 37a47f15b96f..fa1e44b141e5 100644
--- a/devel/p5-Parse-LocalDistribution/Makefile
+++ b/devel/p5-Parse-LocalDistribution/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parses local .pm files as PAUSE does
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Parse-PMFile/Makefile b/devel/p5-Parse-PMFile/Makefile
index 6a65175e35eb..c13063e3f153 100644
--- a/devel/p5-Parse-PMFile/Makefile
+++ b/devel/p5-Parse-PMFile/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parses .pm file as PAUSE does
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Path-Extended/Makefile b/devel/p5-Path-Extended/Makefile
index 3f799f85ccaf..c4cc6548371c 100644
--- a/devel/p5-Path-Extended/Makefile
+++ b/devel/p5-Path-Extended/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ISHIGAKI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for yet another Path class
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Path-IsDev/Makefile b/devel/p5-Path-IsDev/Makefile
index b5c2d443844c..ca52dfcf3176 100644
--- a/devel/p5-Path-IsDev/Makefile
+++ b/devel/p5-Path-IsDev/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KENTNL
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to determine if path resembles dev source tree
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Path-Iterator-Rule/Makefile b/devel/p5-Path-Iterator-Rule/Makefile
index 38f613ebee6c..9bd68bea30a1 100644
--- a/devel/p5-Path-Iterator-Rule/Makefile
+++ b/devel/p5-Path-Iterator-Rule/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for iterative, recursive file finder
 
 LICENSE=	APACHE20
diff --git a/devel/p5-Paws/Makefile b/devel/p5-Paws/Makefile
index b26a77dd8cba..042e64c19f83 100644
--- a/devel/p5-Paws/Makefile
+++ b/devel/p5-Paws/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:JLMARTIN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of SDK for AWS (Amazon Web Services) APIs
 
 LICENSE=	GPLv3
diff --git a/devel/p5-Perl-Metrics-Lite/Makefile b/devel/p5-Perl-Metrics-Lite/Makefile
index 8ac9eac724a5..2943599dda58 100644
--- a/devel/p5-Perl-Metrics-Lite/Makefile
+++ b/devel/p5-Perl-Metrics-Lite/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0$//}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for pluggable Perl Code Metrics System
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Perl-Metrics-Simple/Makefile b/devel/p5-Perl-Metrics-Simple/Makefile
index ce8ba7fcbc99..3b6565580f3f 100644
--- a/devel/p5-Perl-Metrics-Simple/Makefile
+++ b/devel/p5-Perl-Metrics-Simple/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to count packages, subs, lines, etc. of many files
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Perl-PrereqScanner-Lite/Makefile b/devel/p5-Perl-PrereqScanner-Lite/Makefile
index 51b4a635115d..aab56958e538 100644
--- a/devel/p5-Perl-PrereqScanner-Lite/Makefile
+++ b/devel/p5-Perl-PrereqScanner-Lite/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for lightweight prereqs scanner
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Proc-Guard/Makefile b/devel/p5-Proc-Guard/Makefile
index ddcaf037cc17..cf1e2eab0c16 100644
--- a/devel/p5-Proc-Guard/Makefile
+++ b/devel/p5-Proc-Guard/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for process runner with RAII pattern
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Proc-Pidfile/Makefile b/devel/p5-Proc-Pidfile/Makefile
index cb0942d0dc9f..6416315a9e67 100644
--- a/devel/p5-Proc-Pidfile/Makefile
+++ b/devel/p5-Proc-Pidfile/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to manage .pid file for current process
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Project-Libs/Makefile b/devel/p5-Project-Libs/Makefile
index 6eb90e763da7..b8c04f17aae5 100644
--- a/devel/p5-Project-Libs/Makefile
+++ b/devel/p5-Project-Libs/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to add module directories of a project into @INC
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Qudo/Makefile b/devel/p5-Qudo/Makefile
index 286e0b8984a1..e206aed8a692 100644
--- a/devel/p5-Qudo/Makefile
+++ b/devel/p5-Qudo/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NEKOKAK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple and extensible job queue manager
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Regexp-Assemble-Compressed/Makefile b/devel/p5-Regexp-Assemble-Compressed/Makefile
index 5b3ab2595693..289d57cb4131 100644
--- a/devel/p5-Regexp-Assemble-Compressed/Makefile
+++ b/devel/p5-Regexp-Assemble-Compressed/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to compress Regular Expression
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Regexp-Shellish/Makefile b/devel/p5-Regexp-Shellish/Makefile
index 58245d7fdf4e..6e8de3b6f849 100644
--- a/devel/p5-Regexp-Shellish/Makefile
+++ b/devel/p5-Regexp-Shellish/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for shell-like regular expressions
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Scalar-Util-LooksLikeNumber/Makefile b/devel/p5-Scalar-Util-LooksLikeNumber/Makefile
index c034c1666a8a..b938be6c2c71 100644
--- a/devel/p5-Scalar-Util-LooksLikeNumber/Makefile
+++ b/devel/p5-Scalar-Util-LooksLikeNumber/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for looks_like_number() perl API
 
 USES=		perl5
diff --git a/devel/p5-Stream-Buffered/Makefile b/devel/p5-Stream-Buffered/Makefile
index d1811ae3e40f..2327732e9959 100644
--- a/devel/p5-Stream-Buffered/Makefile
+++ b/devel/p5-Stream-Buffered/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for temporary buffer to save bytes
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Sys-Sendfile/Makefile b/devel/p5-Sys-Sendfile/Makefile
index d6ca619ccbf2..7a2c691aa5aa 100644
--- a/devel/p5-Sys-Sendfile/Makefile
+++ b/devel/p5-Sys-Sendfile/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for zero-copy data transfer
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-TAP-Formatter-JUnit/Makefile b/devel/p5-TAP-Formatter-JUnit/Makefile
index 807262d2fa86..18e266eff15e 100644
--- a/devel/p5-TAP-Formatter-JUnit/Makefile
+++ b/devel/p5-TAP-Formatter-JUnit/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Harness output delegate for JUnit output
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-TAP-Harness-JUnit/Makefile b/devel/p5-TAP-Harness-JUnit/Makefile
index f3649d08a0a0..d74648d44a9e 100644
--- a/devel/p5-TAP-Harness-JUnit/Makefile
+++ b/devel/p5-TAP-Harness-JUnit/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to generate JUnit compatible output from TAP
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Term-ReadPassword/Makefile b/devel/p5-Term-ReadPassword/Makefile
index ecd1722a8dbb..951f106e5154 100644
--- a/devel/p5-Term-ReadPassword/Makefile
+++ b/devel/p5-Term-ReadPassword/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for asking the user for a password
 
 USES=		perl5
diff --git a/devel/p5-Test-Declare/Makefile b/devel/p5-Test-Declare/Makefile
index bad807484328..6e920b82df06 100644
--- a/devel/p5-Test-Declare/Makefile
+++ b/devel/p5-Test-Declare/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for declarative testing
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Test-Filename/Makefile b/devel/p5-Test-Filename/Makefile
index c1ba7b0df6d9..2cc65232f621 100644
--- a/devel/p5-Test-Filename/Makefile
+++ b/devel/p5-Test-Filename/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for portable filename comparison
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Test-LoadAllModules/Makefile b/devel/p5-Test-LoadAllModules/Makefile
index 9d0a9535c688..ac86a8a7aad7 100644
--- a/devel/p5-Test-LoadAllModules/Makefile
+++ b/devel/p5-Test-LoadAllModules/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to do use_ok for modules in search path
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Test-Mock-Guard/Makefile b/devel/p5-Test-Mock-Guard/Makefile
index 61ad62d5dd7d..3d006d082f05 100644
--- a/devel/p5-Test-Mock-Guard/Makefile
+++ b/devel/p5-Test-Mock-Guard/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple mock test library using RAII
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 235da17ada2c..5d987a9e5965 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tests remote URLs or local web files
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-Most/Makefile b/devel/p5-Test-Most/Makefile
index 5ca905d1d45c..18e79c34c827 100644
--- a/devel/p5-Test-Most/Makefile
+++ b/devel/p5-Test-Most/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for most commonly needed test functions and features
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-Name-FromLine/Makefile b/devel/p5-Test-Name-FromLine/Makefile
index ffa51fbd417a..8145b86500c0 100644
--- a/devel/p5-Test-Name-FromLine/Makefile
+++ b/devel/p5-Test-Name-FromLine/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to fill test names from caller line
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-Net-LDAP/Makefile b/devel/p5-Test-Net-LDAP/Makefile
index 002640d10965..7dab8ac2fd83 100644
--- a/devel/p5-Test-Net-LDAP/Makefile
+++ b/devel/p5-Test-Net-LDAP/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Net::LDAP subclass for testing
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile
index daa2d9ea93b3..6a227f0270ac 100644
--- a/devel/p5-Test-OpenLDAP/Makefile
+++ b/devel/p5-Test-OpenLDAP/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to creates temp instance of slapd to run tests against
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-PerlTidy/Makefile b/devel/p5-Test-PerlTidy/Makefile
index b8f8ff40a409..a706c8d07e5a 100644
--- a/devel/p5-Test-PerlTidy/Makefile
+++ b/devel/p5-Test-PerlTidy/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to check that all your files are tidy
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Test-Requires/Makefile b/devel/p5-Test-Requires/Makefile
index 497adbc568a7..eddad35f6c1b 100644
--- a/devel/p5-Test-Requires/Makefile
+++ b/devel/p5-Test-Requires/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for checking to see if the module can be loaded
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-SharedFork/Makefile b/devel/p5-Test-SharedFork/Makefile
index c2236aac417a..8cd33718a05c 100644
--- a/devel/p5-Test-SharedFork/Makefile
+++ b/devel/p5-Test-SharedFork/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:EXODIST
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for fork test
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-TCP/Makefile b/devel/p5-Test-TCP/Makefile
index cdbb086ae673..9e6c0aa68efb 100644
--- a/devel/p5-Test-TCP/Makefile
+++ b/devel/p5-Test-TCP/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for testing TCP program
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Test-Time/Makefile b/devel/p5-Test-Time/Makefile
index f50867a927cd..08f1f4366baa 100644
--- a/devel/p5-Test-Time/Makefile
+++ b/devel/p5-Test-Time/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to override time()/sleep() core functions for testing
 
 USES=		perl5
diff --git a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
index 7eb3306adee7..84910765ea68 100644
--- a/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
+++ b/devel/p5-Test-WWW-Mechanize-PSGI/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to test PSGI programs using WWW::Mechanize
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-Text-vFile-asData/Makefile b/devel/p5-Text-vFile-asData/Makefile
index bb34576addcc..c31a5cb2896e 100644
--- a/devel/p5-Text-vFile-asData/Makefile
+++ b/devel/p5-Text-vFile-asData/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse vFile formatted files into data structures
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Time-Crontab/Makefile b/devel/p5-Time-Crontab/Makefile
index 1d80f24520d0..27ac45e35ad1 100644
--- a/devel/p5-Time-Crontab/Makefile
+++ b/devel/p5-Time-Crontab/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parse crontab date and time field
 
 RUN_DEPENDS=	\
diff --git a/devel/p5-Types-URI/Makefile b/devel/p5-Types-URI/Makefile
index 2ef162340d98..603507b3ff43 100644
--- a/devel/p5-Types-URI/Makefile
+++ b/devel/p5-Types-URI/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for type constraints and coercions for URIs
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-Types-UUID/Makefile b/devel/p5-Types-UUID/Makefile
index 7146932bfdf6..bca00338d769 100644
--- a/devel/p5-Types-UUID/Makefile
+++ b/devel/p5-Types-UUID/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOBYINK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for type constraints for UUIDs
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-UNIVERSAL-require/Makefile b/devel/p5-UNIVERSAL-require/Makefile
index cc402528abc8..36007015722c 100644
--- a/devel/p5-UNIVERSAL-require/Makefile
+++ b/devel/p5-UNIVERSAL-require/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to require() from a variable
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-UNIVERSAL-which/Makefile b/devel/p5-UNIVERSAL-which/Makefile
index f429753dde7b..4f1bbb472fb6 100644
--- a/devel/p5-UNIVERSAL-which/Makefile
+++ b/devel/p5-UNIVERSAL-which/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for telling fully qualified name of the method
 
 USES=		perl5
diff --git a/devel/p5-YAML-AppConfig/Makefile b/devel/p5-YAML-AppConfig/Makefile
index 67a811f712f5..f7db2643242e 100644
--- a/devel/p5-YAML-AppConfig/Makefile
+++ b/devel/p5-YAML-AppConfig/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to manage configuration files with YAML
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-asa/Makefile b/devel/p5-asa/Makefile
index 7f3dbdb54208..11c23153555d 100644
--- a/devel/p5-asa/Makefile
+++ b/devel/p5-asa/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ADAMK
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to say your class/object working like something else
 
 USES=		perl5
diff --git a/devel/p5-carton/Makefile b/devel/p5-carton/Makefile
index 7c8253a0f574..e63ab4903756 100644
--- a/devel/p5-carton/Makefile
+++ b/devel/p5-carton/Makefile
@@ -7,7 +7,7 @@ MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Carton-v${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module dependency manager
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/p5-cpan-listchanges/Makefile b/devel/p5-cpan-listchanges/Makefile
index dbe6bfd8abad..e391e3240bc7 100644
--- a/devel/p5-cpan-listchanges/Makefile
+++ b/devel/p5-cpan-listchanges/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to list changes for CPAN modules
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-iCal-Parser/Makefile b/devel/p5-iCal-Parser/Makefile
index eb33c70b06e2..e204823facc3 100644
--- a/devel/p5-iCal-Parser/Makefile
+++ b/devel/p5-iCal-Parser/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Parse iCalendar files into a data structure
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index af68d39fdd03..e62b8a92dd9f 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAARG
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to create and use a local lib/ with PERL5LIB
 
 LICENSE=	ART10 GPLv1+
diff --git a/devel/rubygem-cool.io/Makefile b/devel/rubygem-cool.io/Makefile
index 0da3de994275..cd4ba76e33ba 100644
--- a/devel/rubygem-cool.io/Makefile
+++ b/devel/rubygem-cool.io/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gems for cool.io
 
 LICENSE=	MIT
diff --git a/devel/rubygem-ditz/Makefile b/devel/rubygem-ditz/Makefile
index 2fded37c8666..318e48f427f8 100644
--- a/devel/rubygem-ditz/Makefile
+++ b/devel/rubygem-ditz/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	3
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple lightweight distributed issue tracker
 
 LICENSE=	GPLv3+
diff --git a/devel/rubygem-iobuffer/Makefile b/devel/rubygem-iobuffer/Makefile
index c41d365e6b77..065bb0b6890c 100644
--- a/devel/rubygem-iobuffer/Makefile
+++ b/devel/rubygem-iobuffer/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	1.1.2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gems for iobuffer
 
 USE_RUBY=	yes
diff --git a/ftp/p5-Net-FTP-Common/Makefile b/ftp/p5-Net-FTP-Common/Makefile
index bc21512175fb..2ed3159d1489 100644
--- a/ftp/p5-Net-FTP-Common/Makefile
+++ b/ftp/p5-Net-FTP-Common/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to provide simplify common usages of Net::FTP
 
 LICENSE=	MIT
diff --git a/ftp/p5-Net-FTP-Recursive/Makefile b/ftp/p5-Net-FTP-Recursive/Makefile
index 6620d1dfde8a..3cef3f524a9d 100644
--- a/ftp/p5-Net-FTP-Recursive/Makefile
+++ b/ftp/p5-Net-FTP-Recursive/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	ftp perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to provide recursive FTP client class
 
 LICENSE=	ART10 GPLv1+
diff --git a/graphics/flasm/Makefile b/graphics/flasm/Makefile
index 1fa24cc45024..d2aa6ca29d6a 100644
--- a/graphics/flasm/Makefile
+++ b/graphics/flasm/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	LOCAL/kuriyama \
 		http://www.nowrap.de/download/
 DISTNAME=	flasm16src
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Command line assembler/disassembler of flash actionscript bytecode
 
 USES=		bison dos2unix gmake gperf zip
diff --git a/graphics/p5-Barcode-ZBar/Makefile b/graphics/p5-Barcode-ZBar/Makefile
index 36606c33fe6e..7df6c60d9de1 100644
--- a/graphics/p5-Barcode-ZBar/Makefile
+++ b/graphics/p5-Barcode-ZBar/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to ZBar barcode reader
 
 LIB_DEPENDS=	libzbar.so:graphics/zbar
diff --git a/graphics/p5-Convert-Color/Makefile b/graphics/p5-Convert-Color/Makefile
index 85721c7741d7..4d8a7a6b5309 100644
--- a/graphics/p5-Convert-Color/Makefile
+++ b/graphics/p5-Convert-Color/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	graphics perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for color space conversions and named lookups
 
 LICENSE=	ART10 GPLv1+
diff --git a/graphics/py-blockdiagcontrib-cisco/Makefile b/graphics/py-blockdiagcontrib-cisco/Makefile
index b68c2072b88a..429e50c8a415 100644
--- a/graphics/py-blockdiagcontrib-cisco/Makefile
+++ b/graphics/py-blockdiagcontrib-cisco/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	graphics python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Networking shapes for blockdiag designed by Cisco
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}blockdiag>=0.8.0:graphics/py-blockdiag@${PY_FLAVOR}
diff --git a/japanese/ajaxzip2-core/Makefile b/japanese/ajaxzip2-core/Makefile
index 9be3c67a2737..1e4710f636eb 100644
--- a/japanese/ajaxzip2-core/Makefile
+++ b/japanese/ajaxzip2-core/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-core
 DISTNAME=	${PORTNAME}-${PORTVERSION}${PKGNAMESUFFIX}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ajaxzip2 (Japanese ZIP code utility) core scripts
 
 USES=		dos2unix shebangfix zip
diff --git a/japanese/ajaxzip2-data/Makefile b/japanese/ajaxzip2-data/Makefile
index c34887db7975..aef57e0fc0ce 100644
--- a/japanese/ajaxzip2-data/Makefile
+++ b/japanese/ajaxzip2-data/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	LOCAL/kuriyama
 PKGNAMESUFFIX=	-data
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ajaxzip2 (Japanese ZIP code utility) ZIP data
 
 BUILD_DEPENDS=	ja-ajaxzip2-core>0:japanese/ajaxzip2-core \
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 14273f35234d..c4f08cf2d954 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	LOCAL/hrs
 DISTFILES=	# empty
 .endif
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese translation of FreeBSD manual pages
 
 RUN_DEPENDS=	jman:japanese/man
diff --git a/japanese/p5-Date-Japanese-Holiday/Makefile b/japanese/p5-Date-Japanese-Holiday/Makefile
index 5d4da45cb66e..634650c3c29a 100644
--- a/japanese/p5-Date-Japanese-Holiday/Makefile
+++ b/japanese/p5-Date-Japanese-Holiday/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for Calculate Japanese Holiday
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/japanese/p5-Encode-ISO2022/Makefile b/japanese/p5-Encode-ISO2022/Makefile
index 2f50fb7c764c..eddadaca1836 100644
--- a/japanese/p5-Encode-ISO2022/Makefile
+++ b/japanese/p5-Encode-ISO2022/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	0.04
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ISO/IEC 2022 character encoding scheme
 
 LICENSE=	ART10 GPLv1+
diff --git a/japanese/p5-Encode-JP-Emoji/Makefile b/japanese/p5-Encode-JP-Emoji/Makefile
index 01022242f9db..517ae156b15c 100644
--- a/japanese/p5-Encode-JP-Emoji/Makefile
+++ b/japanese/p5-Encode-JP-Emoji/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Emoji encodings and cross-mapping tables
 
 USES=		perl5
diff --git a/japanese/p5-Encode-JP-Mobile/Makefile b/japanese/p5-Encode-JP-Mobile/Makefile
index ea613625db17..1e4cf6b157c1 100644
--- a/japanese/p5-Encode-JP-Mobile/Makefile
+++ b/japanese/p5-Encode-JP-Mobile/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for encoding for mobile phones in Japan
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index 8f3362940e14..87698edca4f2 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension interface to convert Japanese text
 
 LICENSE=	ART10 GPLv1+
diff --git a/japanese/p5-Lingua-JA-Kana/Makefile b/japanese/p5-Lingua-JA-Kana/Makefile
index 26eaced9d1fd..c62da403f5dd 100644
--- a/japanese/p5-Lingua-JA-Kana/Makefile
+++ b/japanese/p5-Lingua-JA-Kana/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Converts between Kanas and Romaji
 
 USES=		perl5
diff --git a/japanese/p5-Lingua-JA-Moji/Makefile b/japanese/p5-Lingua-JA-Moji/Makefile
index aaf2bff5464f..052ceed3fc82 100644
--- a/japanese/p5-Lingua-JA-Moji/Makefile
+++ b/japanese/p5-Lingua-JA-Moji/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	0.36
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to handle many kinds of Japanese characters
 
 LICENSE=	ART10 GPLv1+
diff --git a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
index 005c47465924..1be66a7f7afe 100644
--- a/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
+++ b/japanese/p5-Lingua-JA-Regular-Unicode/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	1
 CATEGORIES=	japanese perl5
 MASTER_SITES=	CPAN
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to convert Japanese chars
 
 TEST_DEPENDS=	\
diff --git a/japanese/p5-PDFJ/Makefile b/japanese/p5-PDFJ/Makefile
index ee74de7b7861..f36aab4ac0ab 100644
--- a/japanese/p5-PDFJ/Makefile
+++ b/japanese/p5-PDFJ/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	3
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://hp1.jonex.ne.jp/%7Enakajima.yasushi/archives/
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PDFJ module provides methods to generate Japanese PDF file
 
 USES=		perl5 shebangfix zip:infozip
diff --git a/japanese/zipcodes/Makefile b/japanese/zipcodes/Makefile
index daf2341a00c5..4229472cbe7a 100644
--- a/japanese/zipcodes/Makefile
+++ b/japanese/zipcodes/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	japanese
 MASTER_SITES=	LOCAL/kuriyama
 DISTFILES=	ken_all-${PORTVERSION_K}.zip jigyosyo-${PORTVERSION_J}.zip
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese zipcode tables. includes both 3/5 and 7 digits form
 
 BUILD_DEPENDS=	nkf:japanese/nkf
diff --git a/lang/p5-JavaScript-Value-Escape/Makefile b/lang/p5-JavaScript-Value-Escape/Makefile
index fa67fa6d35e6..0ae268cf74f4 100644
--- a/lang/p5-JavaScript-Value-Escape/Makefile
+++ b/lang/p5-JavaScript-Value-Escape/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	lang perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to avoid XSS with JavaScript value interpolation
 
 LICENSE=	ART10 GPLv1+
diff --git a/mail/p5-Email-Address-Loose/Makefile b/mail/p5-Email-Address-Loose/Makefile
index e9bc7f8174f7..41fffad7e5d1 100644
--- a/mail/p5-Email-Address-Loose/Makefile
+++ b/mail/p5-Email-Address-Loose/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to make Email::Address->parse() loose
 
 RUN_DEPENDS=	\
diff --git a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
index d2e138b8e7ce..5851d78a8ccd 100644
--- a/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
+++ b/mail/p5-Email-MIME-Creator-ISO_2022_JP/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Email::MIME mixin to create an iso-2022-jp mail
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/mail/p5-Email-Sender-Transport-SMTPS/Makefile b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
index def306911b8b..d7a822b61084 100644
--- a/mail/p5-Email-Sender-Transport-SMTPS/Makefile
+++ b/mail/p5-Email-Sender-Transport-SMTPS/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Email::Sender::Transport::SMTPS
 
 LICENSE=	ART10 GPLv1+
diff --git a/mail/p5-Email-Valid-Loose/Makefile b/mail/p5-Email-Valid-Loose/Makefile
index 03f0add5fa2c..c3b48c093af3 100644
--- a/mail/p5-Email-Valid-Loose/Makefile
+++ b/mail/p5-Email-Valid-Loose/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Variation of Email::Valid which allows dot before at mark
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/mail/p5-IMAP-Sieve/Makefile b/mail/p5-IMAP-Sieve/Makefile
index 609c13af6ca1..462e5bffcd63 100644
--- a/mail/p5-IMAP-Sieve/Makefile
+++ b/mail/p5-IMAP-Sieve/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	SF/websieve/websieve/063a
 PKGNAMEPREFIX=	p5-
 DISTNAME=	websieve-063a
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to edit Sieve scripts on an Cyrus IMAP server
 
 RUN_DEPENDS=	p5-IO-Socket-SSL>=0:security/p5-IO-Socket-SSL
diff --git a/mail/p5-MIME-EcoEncode/Makefile b/mail/p5-MIME-EcoEncode/Makefile
index 00cc55e92e86..a6df8b439e24 100644
--- a/mail/p5-MIME-EcoEncode/Makefile
+++ b/mail/p5-MIME-EcoEncode/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for economical MIME Encoding
 
 USES=		perl5
diff --git a/mail/p5-Mail-Tools/Makefile b/mail/p5-Mail-Tools/Makefile
index 496dda814d14..0e170a552ff7 100644
--- a/mail/p5-Mail-Tools/Makefile
+++ b/mail/p5-Mail-Tools/Makefile
@@ -7,7 +7,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	MailTools-${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 modules for dealing with Internet e-mail messages
 
 LICENSE=	ART10 GPLv1+
diff --git a/mail/p5-Parse-MIME/Makefile b/mail/p5-Parse-MIME/Makefile
index 6b843754d4e8..9b88766fcfd5 100644
--- a/mail/p5-Parse-MIME/Makefile
+++ b/mail/p5-Parse-MIME/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	mail perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parse mime-types
 
 LICENSE=	ART10 GPLv1+
diff --git a/math/p5-Math-Vec/Makefile b/math/p5-Math-Vec/Makefile
index e2226adba456..8cc8fe507d2d 100644
--- a/math/p5-Math-Vec/Makefile
+++ b/math/p5-Math-Vec/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Object-Oriented Vector Math Methods in Perl
 
 USES=		perl5
diff --git a/math/p5-Number-Misc/Makefile b/math/p5-Number-Misc/Makefile
index 19addf6e0b20..7224924f902c 100644
--- a/math/p5-Number-Misc/Makefile
+++ b/math/p5-Number-Misc/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	math perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of handy utilities for numbers
 
 LICENSE=	ART10 GPLv1+
diff --git a/misc/amanda-perl-wrapper/Makefile b/misc/amanda-perl-wrapper/Makefile
index 6ee038ddad74..87f9aea3ab72 100644
--- a/misc/amanda-perl-wrapper/Makefile
+++ b/misc/amanda-perl-wrapper/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	misc perl5
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl wrapper to use with Amanda (with libthr.so.* linked)
 
 USES=		perl5
diff --git a/misc/elscreen/Makefile b/misc/elscreen/Makefile
index c2d2d15c6735..76d1192a90a4 100644
--- a/misc/elscreen/Makefile
+++ b/misc/elscreen/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	5
 CATEGORIES=	misc elisp
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs utility similar to GNU Screen
 
 LICENSE=	GPLv2
diff --git a/net-mgmt/ipcalc/Makefile b/net-mgmt/ipcalc/Makefile
index 8045e64fa1de..06ca21621b57 100644
--- a/net-mgmt/ipcalc/Makefile
+++ b/net-mgmt/ipcalc/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	net-mgmt
 MASTER_SITES=	http://jodies.de/ipcalc-archive/
 DIST_SUBDIR=	ipcalc
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	IP Calculator
 
 LICENSE=	GPLv2
diff --git a/net-mgmt/sblim-wbemcli/Makefile b/net-mgmt/sblim-wbemcli/Makefile
index 05c9157b6552..7a0ada7161fe 100644
--- a/net-mgmt/sblim-wbemcli/Makefile
+++ b/net-mgmt/sblim-wbemcli/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/sblim/${PORTNAME}/${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	CLI for Web Based Enterprise Management by SBLIM
 
 BUILD_DEPENDS=	libwww-config:www/libwww
diff --git a/net/p5-AnyEvent-MPRPC/Makefile b/net/p5-AnyEvent-MPRPC/Makefile
index a1fb31033d81..4c37d1d2bf06 100644
--- a/net/p5-AnyEvent-MPRPC/Makefile
+++ b/net/p5-AnyEvent-MPRPC/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple TCP-based MPRPC client/server
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/net/p5-Net-APNS/Makefile b/net/p5-Net-APNS/Makefile
index 972b8cb16c52..a373de1f2d59 100644
--- a/net/p5-Net-APNS/Makefile
+++ b/net/p5-Net-APNS/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Apple Push Notification Service
 
 RUN_DEPENDS=	\
diff --git a/net/p5-Net-APNs-Extended/Makefile b/net/p5-Net-APNs-Extended/Makefile
index 84c997fdf0bb..dfc4e71a5e07 100644
--- a/net/p5-Net-APNs-Extended/Makefile
+++ b/net/p5-Net-APNs-Extended/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for APNs that support the extended format
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-Net-Amazon-Signature-V3/Makefile b/net/p5-Net-Amazon-Signature-V3/Makefile
index 9cb50c2dd265..0f0503b4d56d 100644
--- a/net/p5-Net-Amazon-Signature-V3/Makefile
+++ b/net/p5-Net-Amazon-Signature-V3/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to sign AWS requests V3
 
 LICENSE=	LGPL21
diff --git a/net/p5-Net-Amazon-Signature-V4/Makefile b/net/p5-Net-Amazon-Signature-V4/Makefile
index d89af7e0575f..5d4903183605 100644
--- a/net/p5-Net-Amazon-Signature-V4/Makefile
+++ b/net/p5-Net-Amazon-Signature-V4/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for AWS signature V4, AWS4-HMAC-SHA256
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-Net-CIDR-MobileJP/Makefile b/net/p5-Net-CIDR-MobileJP/Makefile
index bafd786ff370..d52c7d6ba43d 100644
--- a/net/p5-Net-CIDR-MobileJP/Makefile
+++ b/net/p5-Net-CIDR-MobileJP/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for mobile IP address in Japan
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/net/p5-Net-Google-Analytics/Makefile b/net/p5-Net-Google-Analytics/Makefile
index ec8d33eabd76..691f3e7db2c6 100644
--- a/net/p5-Net-Google-Analytics/Makefile
+++ b/net/p5-Net-Google-Analytics/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Google Analytics Data Export API
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-Net-SSH-Mechanize/Makefile b/net/p5-Net-SSH-Mechanize/Makefile
index b72f8dda8c0b..a592d2f6eb4c 100644
--- a/net/p5-Net-SSH-Mechanize/Makefile
+++ b/net/p5-Net-SSH-Mechanize/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for asynchronous ssh command invocation
 
 RUN_DEPENDS=	\
diff --git a/net/p5-Net-Server-Coro/Makefile b/net/p5-Net-Server-Coro/Makefile
index 239882305c7d..c5414e6e9164 100644
--- a/net/p5-Net-Server-Coro/Makefile
+++ b/net/p5-Net-Server-Coro/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for co-operative multithreaded server using Coro
 
 LICENSE=	MIT
diff --git a/net/p5-Net-Telnet/Makefile b/net/p5-Net-Telnet/Makefile
index 06c6053bcdc2..3079ed1ca075 100644
--- a/net/p5-Net-Telnet/Makefile
+++ b/net/p5-Net-Telnet/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl5 module to access and use telnet protocol
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-Net-Traceroute/Makefile b/net/p5-Net-Traceroute/Makefile
index 8cd17cd99768..c88d4f655f96 100644
--- a/net/p5-Net-Traceroute/Makefile
+++ b/net/p5-Net-Traceroute/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:HAG
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to parse traceroute(8)
 
 USES=		perl5
diff --git a/net/p5-POEx-Role-TCPServer/Makefile b/net/p5-POEx-Role-TCPServer/Makefile
index 813148963e73..e9245448e40b 100644
--- a/net/p5-POEx-Role-TCPServer/Makefile
+++ b/net/p5-POEx-Role-TCPServer/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:NPEREZ
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for TCPServer Moose role on POE
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-POSIX-Socket/Makefile b/net/p5-POSIX-Socket/Makefile
index 8df86169fbc8..65cac76b613a 100644
--- a/net/p5-POSIX-Socket/Makefile
+++ b/net/p5-POSIX-Socket/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for POSIX socket low-level interface
 
 USES=	perl5
diff --git a/net/p5-POSIX-getpeername/Makefile b/net/p5-POSIX-getpeername/Makefile
index 58e03087ab54..af30ff81bb60 100644
--- a/net/p5-POSIX-getpeername/Makefile
+++ b/net/p5-POSIX-getpeername/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to provide getpeername(2)
 
 USES=	perl5
diff --git a/net/p5-RPC-EPC-Service/Makefile b/net/p5-RPC-EPC-Service/Makefile
index 443dc9d2534d..3a2d5e29870e 100644
--- a/net/p5-RPC-EPC-Service/Makefile
+++ b/net/p5-RPC-EPC-Service/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for asynchronous remote procedure stack
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-Server-Starter/Makefile b/net/p5-Server-Starter/Makefile
index be438ab41d21..0996fea5ccc8 100644
--- a/net/p5-Server-Starter/Makefile
+++ b/net/p5-Server-Starter/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZUHO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of superdaemon for hot-deploying server programs
 
 LICENSE=	ART10 GPLv1+
diff --git a/net/p5-URI-Match/Makefile b/net/p5-URI-Match/Makefile
index 634ca8ccfdab..446cecf08335 100644
--- a/net/p5-URI-Match/Makefile
+++ b/net/p5-URI-Match/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for matching URLs by parts
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/net/p5-URI-Template-Restrict/Makefile b/net/p5-URI-Template-Restrict/Makefile
index 7971c3b69d67..6557fb545664 100644
--- a/net/p5-URI-Template-Restrict/Makefile
+++ b/net/p5-URI-Template-Restrict/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	net perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for restricted URI Templates handler
 
 RUN_DEPENDS=	\
diff --git a/net/tramp/Makefile b/net/tramp/Makefile
index f2a0002b2b53..b65956e6b78f 100644
--- a/net/tramp/Makefile
+++ b/net/tramp/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	net elisp
 MASTER_SITES=	GNU
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparent remote file access tool for Emacs
 
 LICENSE=	GPLv3+
diff --git a/print/p5-Font-FreeType/Makefile b/print/p5-Font-FreeType/Makefile
index b22817171b96..9fdc8175e241 100644
--- a/print/p5-Font-FreeType/Makefile
+++ b/print/p5-Font-FreeType/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	print perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to read font files and render glyphs using FreeType2
 
 LICENSE=	ARTPERL10
diff --git a/security/p5-App-TLSMe/Makefile b/security/p5-App-TLSMe/Makefile
index d558e34ff161..e2d20dcb447b 100644
--- a/security/p5-App-TLSMe/Makefile
+++ b/security/p5-App-TLSMe/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/0000$//}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for TLS/SSL tunnel
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/security/p5-Crypt-URandom/Makefile b/security/p5-Crypt-URandom/Makefile
index 5f226aa9f73f..af00d29f44f5 100644
--- a/security/p5-Crypt-URandom/Makefile
+++ b/security/p5-Crypt-URandom/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to provide non blocking randomness
 
 LICENSE=	ART10 GPLv1+
diff --git a/security/p5-Digest-MurmurHash/Makefile b/security/p5-Digest-MurmurHash/Makefile
index e2b427c07c53..988f473067ec 100644
--- a/security/p5-Digest-MurmurHash/Makefile
+++ b/security/p5-Digest-MurmurHash/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	security perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for XS interface to the MurmurHash algorithm
 
 USES=		perl5
diff --git a/security/starttls/Makefile b/security/starttls/Makefile
index 23eb559001ed..fc87408d8538 100644
--- a/security/starttls/Makefile
+++ b/security/starttls/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.opaopa.org/pub/elisp/
 PKGNAMESUFFIX=	${EMACS_PKGNAMESUFFIX}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple wrapper program for STARTTLS on ${EMACS_PORT_NAME}
 
 USES=		emacs gmake ssl
diff --git a/sysutils/p5-Proclet/Makefile b/sysutils/p5-Proclet/Makefile
index aff05f143088..11c2c007eee4 100644
--- a/sysutils/p5-Proclet/Makefile
+++ b/sysutils/p5-Proclet/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZEBURO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for minimalistic Supervisor
 
 LICENSE=	ART10 GPLv1+
diff --git a/sysutils/p5-Schedule-At/Makefile b/sysutils/p5-Schedule-At/Makefile
index 592d3f4fbd17..669195dddf26 100644
--- a/sysutils/p5-Schedule-At/Makefile
+++ b/sysutils/p5-Schedule-At/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	OS independent interface to the Unix 'at' command
 
 USES=		perl5
diff --git a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
index 4b6f1f7a5482..b7462ec91fff 100644
--- a/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
+++ b/sysutils/rubygem-fluent-plugin-tail-asis/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	0.0.3
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gems for fluent plugin to read whole line into single key
 
 RUN_DEPENDS=	\
diff --git a/textproc/dsssl-docbook-modular/Makefile b/textproc/dsssl-docbook-modular/Makefile
index 06ece4e8d2b0..4768dc95d749 100644
--- a/textproc/dsssl-docbook-modular/Makefile
+++ b/textproc/dsssl-docbook-modular/Makefile
@@ -14,7 +14,7 @@ PATCH_SITES=	http://dist.bsdlab.org/
 PATCHFILES=	docbook-dsssl-mn-20070525.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DSSSL stylesheets for the DocBook DTD by Norman Walsh
 
 BUILD_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
diff --git a/textproc/html/Makefile b/textproc/html/Makefile
index 076fb7525cb9..ac0b98075113 100644
--- a/textproc/html/Makefile
+++ b/textproc/html/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/kuriyama
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	All W3C published SGML DTDs for HTML
 
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
diff --git a/textproc/iso12083/Makefile b/textproc/iso12083/Makefile
index 78df6499bbc4..4509c7391cd9 100644
--- a/textproc/iso12083/Makefile
+++ b/textproc/iso12083/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	LOCAL/kuriyama/iso12083
 DISTFILES=	article.dtd book.dtd maths.dtd serial.dtd
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SGML DTDs from the The Electronic Publishing Special Interest Group
 
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
diff --git a/textproc/iso8879/Makefile b/textproc/iso8879/Makefile
index 532bc9eb219d..fe9935298a28 100644
--- a/textproc/iso8879/Makefile
+++ b/textproc/iso8879/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/kuriyama
 DISTNAME=	isoENTS
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Character entity sets from ISO 8879:1986 (SGML)
 
 LICENSE=	IOS
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 45c46e0a7eee..23625d6bdf81 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -12,7 +12,7 @@ PATCH_SITES=	http://dist.bsdlab.org/
 PATCHFILES=	jade_1.2.1-35.diff.gz
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
diff --git a/textproc/linuxdoc/Makefile b/textproc/linuxdoc/Makefile
index aa5058b99584..72f7e11e89e5 100644
--- a/textproc/linuxdoc/Makefile
+++ b/textproc/linuxdoc/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://dist.bsdlab.org/ \
 		http://fallout.campusview.indiana.edu/ports/distfiles/
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The Linuxdoc SGML DTD
 
 RUN_DEPENDS=	${ISOCAT}:textproc/iso8879 \
diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile
index 4f4408b70f3c..13f9d60c9b09 100644
--- a/textproc/openfts/Makefile
+++ b/textproc/openfts/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/OpenFTS-perl%2C%20v${PORTVERSION}
 DISTNAME=	Search-OpenFTS-${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source Full Text Search engine
 
 RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 81a86e5dc6a3..fe63e1c6e84a 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.3.3
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/p/-pre/}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object-oriented SGML/XML parser toolkit and DSSSL engine
 
 LIB_DEPENDS=	libosp.so:textproc/opensp
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 68f5dd7f7095..b7d3767598bb 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	SF/openjade/${PORTNAME:tl}/${PORTVERSION}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Collection of SGML/XML tools
 
 LICENSE=	JamesClark
diff --git a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
index e4b811e8de0c..1062416843db 100644
--- a/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
+++ b/textproc/p5-Lingua-EN-Inflect-Phrase/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to inflect short English Phrases
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile b/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
index a72a12892722..6c502a838b17 100644
--- a/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
+++ b/textproc/p5-Lingua-EN-Number-IsOrdinal/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to detect if English number is ordinal or cardinal
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Net-Groonga-HTTP/Makefile b/textproc/p5-Net-Groonga-HTTP/Makefile
index 4751618371fb..050dd14fe882 100644
--- a/textproc/p5-Net-Groonga-HTTP/Makefile
+++ b/textproc/p5-Net-Groonga-HTTP/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Groonga httpd client library
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Senna/Makefile b/textproc/p5-Senna/Makefile
index 91648d7bf8ff..d883e8fd6cbe 100644
--- a/textproc/p5-Senna/Makefile
+++ b/textproc/p5-Senna/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for Embeddable Fulltext Search Engine
 
 LICENSE=	LGPL21
diff --git a/textproc/p5-String-Compare-ConstantTime/Makefile b/textproc/p5-String-Compare-ConstantTime/Makefile
index 10d900cbe64b..d9a8dc9ff058 100644
--- a/textproc/p5-String-Compare-ConstantTime/Makefile
+++ b/textproc/p5-String-Compare-ConstantTime/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for timing side-channel protected string compare
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-String-Trim/Makefile b/textproc/p5-String-Trim/Makefile
index b389860180de..11811b444b01 100644
--- a/textproc/p5-String-Trim/Makefile
+++ b/textproc/p5-String-Trim/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to trim whitespace from your strings
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-String-Urandom/Makefile b/textproc/p5-String-Urandom/Makefile
index e8b283062fef..afd4e10f5041 100644
--- a/textproc/p5-String-Urandom/Makefile
+++ b/textproc/p5-String-Urandom/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to convert /dev/urandom to 8-bit chars
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-TeX-Hyphen/Makefile b/textproc/p5-TeX-Hyphen/Makefile
index 58775029e1c2..ee81f7026d34 100644
--- a/textproc/p5-TeX-Hyphen/Makefile
+++ b/textproc/p5-TeX-Hyphen/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Hyphenate words using TeX's patterns
 
 USES=		perl5
diff --git a/textproc/p5-Template-Semantic/Makefile b/textproc/p5-Template-Semantic/Makefile
index 64177a7ce3e0..6354bff551c0 100644
--- a/textproc/p5-Template-Semantic/Makefile
+++ b/textproc/p5-Template-Semantic/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to use pure XHTML/XML as a template
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Test-Groonga/Makefile b/textproc/p5-Test-Groonga/Makefile
index 697b2bf5a317..b67c68760484 100644
--- a/textproc/p5-Test-Groonga/Makefile
+++ b/textproc/p5-Test-Groonga/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for testing Groonga full-text search engine
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-Brew/Makefile b/textproc/p5-Text-Brew/Makefile
index c5c774bc9391..9cd5606ec7f6 100644
--- a/textproc/p5-Text-Brew/Makefile
+++ b/textproc/p5-Text-Brew/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for the Brew edit distance
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-CSV-Simple/Makefile b/textproc/p5-Text-CSV-Simple/Makefile
index 6ff1fdbc0d83..17d5e246d5f5 100644
--- a/textproc/p5-Text-CSV-Simple/Makefile
+++ b/textproc/p5-Text-CSV-Simple/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for Simpler parsing of CSV files
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/textproc/p5-Text-ClearSilver/Makefile b/textproc/p5-Text-ClearSilver/Makefile
index 055b5de1f577..b7df419dffad 100644
--- a/textproc/p5-Text-ClearSilver/Makefile
+++ b/textproc/p5-Text-ClearSilver/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to the ClearSilver template engine
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-DHCPLeases/Makefile b/textproc/p5-Text-DHCPLeases/Makefile
index 7b50dd7d8799..2dd06c5db794 100644
--- a/textproc/p5-Text-DHCPLeases/Makefile
+++ b/textproc/p5-Text-DHCPLeases/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parse DHCP leases file from ISC dhcpd
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-LTSV/Makefile b/textproc/p5-Text-LTSV/Makefile
index e5c4cfa5f48d..0614bce3b2b5 100644
--- a/textproc/p5-Text-LTSV/Makefile
+++ b/textproc/p5-Text-LTSV/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Labeled Tab Separated Value manipulator
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-MicroMason/Makefile b/textproc/p5-Text-MicroMason/Makefile
index 93e9804b9439..6f5a1d7c39c6 100644
--- a/textproc/p5-Text-MicroMason/Makefile
+++ b/textproc/p5-Text-MicroMason/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for simple and extensible templating
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-MicroTemplate-Extended/Makefile b/textproc/p5-Text-MicroTemplate-Extended/Makefile
index 09600c87f96c..fc88b98ae942 100644
--- a/textproc/p5-Text-MicroTemplate-Extended/Makefile
+++ b/textproc/p5-Text-MicroTemplate-Extended/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for extended MicroTemplate
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-MicroTemplate/Makefile b/textproc/p5-Text-MicroTemplate/Makefile
index a2d7c2f7cd26..ea6766c1f726 100644
--- a/textproc/p5-Text-MicroTemplate/Makefile
+++ b/textproc/p5-Text-MicroTemplate/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for standalone, fast and intelligent template engine
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-Patch/Makefile b/textproc/p5-Text-Patch/Makefile
index 8afc529a6c69..621ad51e9f0b 100644
--- a/textproc/p5-Text-Patch/Makefile
+++ b/textproc/p5-Text-Patch/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to patch text with given patch
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/textproc/p5-Text-Pipe/Makefile b/textproc/p5-Text-Pipe/Makefile
index 4435abfcdc71..6998730202f0 100644
--- a/textproc/p5-Text-Pipe/Makefile
+++ b/textproc/p5-Text-Pipe/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for common text filter API
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-Sass/Makefile b/textproc/p5-Text-Sass/Makefile
index 024337b4906f..e3c086b9b7bb 100644
--- a/textproc/p5-Text-Sass/Makefile
+++ b/textproc/p5-Text-Sass/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RPETTETT
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl implementation of http://sass-lang.com/
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-SimpleTable-AutoWidth/Makefile b/textproc/p5-Text-SimpleTable-AutoWidth/Makefile
index dc5d7f18c615..6b2839f29d57 100644
--- a/textproc/p5-Text-SimpleTable-AutoWidth/Makefile
+++ b/textproc/p5-Text-SimpleTable-AutoWidth/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for ASCII tables auto-width selection
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-VisualWidth/Makefile b/textproc/p5-Text-VisualWidth/Makefile
index ee0207620d8e..d76c074c2b1a 100644
--- a/textproc/p5-Text-VisualWidth/Makefile
+++ b/textproc/p5-Text-VisualWidth/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for trimming text by terminal columns
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
index 5732e19b234d..183ea488fbd0 100644
--- a/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
+++ b/textproc/p5-Text-Xslate-Bridge-TT2Like/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of TT2 Variable Method Clone for Text::Xslate
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-Tiffany/Makefile b/textproc/p5-Tiffany/Makefile
index cf3f94cc16ee..421a04838716 100644
--- a/textproc/p5-Tiffany/Makefile
+++ b/textproc/p5-Tiffany/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for generic interface for Perl5 template engines
 
 TEST_DEPENDS=	\
diff --git a/textproc/p5-XML-AutoWriter/Makefile b/textproc/p5-XML-AutoWriter/Makefile
index 62bc0d38a208..e8f82471a8d5 100644
--- a/textproc/p5-XML-AutoWriter/Makefile
+++ b/textproc/p5-XML-AutoWriter/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 DISTNAME=	${PORTNAME}-0.4
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for DOCTYPE based XML output
 
 LICENSE=	ART10 GPLv1 BSD4CLAUSE
diff --git a/textproc/p5-XML-DOM/Makefile b/textproc/p5-XML-DOM/Makefile
index a8926985eba9..29858a572cf8 100644
--- a/textproc/p5-XML-DOM/Makefile
+++ b/textproc/p5-XML-DOM/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module for building DOM Level 1 compliant document structures
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-XML-OPML-LibXML/Makefile b/textproc/p5-XML-OPML-LibXML/Makefile
index ad7ea94a4b65..267f85c4408b 100644
--- a/textproc/p5-XML-OPML-LibXML/Makefile
+++ b/textproc/p5-XML-OPML-LibXML/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to parse OPML document with LibXML parser
 
 RUN_DEPENDS=	p5-XML-LibXML>1.60:textproc/p5-XML-LibXML
diff --git a/textproc/p5-XML-Parser/Makefile b/textproc/p5-XML-Parser/Makefile
index 4b4a320a0046..6721f0f4c810 100644
--- a/textproc/p5-XML-Parser/Makefile
+++ b/textproc/p5-XML-Parser/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension interface to James Clark's XML parser, expat
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/p5-YAML-Tiny-Color/Makefile b/textproc/p5-YAML-Tiny-Color/Makefile
index 6356310a691a..1b16d160c0e6 100644
--- a/textproc/p5-YAML-Tiny-Color/Makefile
+++ b/textproc/p5-YAML-Tiny-Color/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to dump YAML with color
 
 LICENSE=	ART10 GPLv1+
diff --git a/textproc/rubygem-charlock_holmes/Makefile b/textproc/rubygem-charlock_holmes/Makefile
index 02743a8f1d97..30569acadec5 100644
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	2
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Gems for character encoding detection
 
 LICENSE=	MIT
diff --git a/textproc/rubygem-ltsv/Makefile b/textproc/rubygem-ltsv/Makefile
index ad88340dfcd8..e3c322a205d4 100644
--- a/textproc/rubygem-ltsv/Makefile
+++ b/textproc/rubygem-ltsv/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	0.1.0
 CATEGORIES=	textproc rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Parser / Dumper for LTSV
 
 NO_ARCH=	yes
diff --git a/textproc/senna/Makefile b/textproc/senna/Makefile
index 48dfef0d8030..0917de537eff 100644
--- a/textproc/senna/Makefile
+++ b/textproc/senna/Makefile
@@ -5,7 +5,7 @@ PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	OSDN/senna
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Embeddable Fulltext Search Engine
 
 BROKEN_aarch64=		does not build: libsenna.so: undefined reference to SEN_ATOMIC_ADD_EX
diff --git a/textproc/sgmlformat/Makefile b/textproc/sgmlformat/Makefile
index 0875ff9e1c3f..0100e4f6df27 100644
--- a/textproc/sgmlformat/Makefile
+++ b/textproc/sgmlformat/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	7
 CATEGORIES=	textproc print
 MASTER_SITES=	LOCAL/kuriyama
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generates groff and HTML from linuxdoc and docbook SGML documents
 
 USES=		perl5 uidfix
diff --git a/textproc/xhtml/Makefile b/textproc/xhtml/Makefile
index 83940c3b09dd..51c1e1a5dde5 100644
--- a/textproc/xhtml/Makefile
+++ b/textproc/xhtml/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/kuriyama
 DISTNAME=	xhtml1-20020801
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	W3C's XHTML DTD
 
 RUN_DEPENDS=	xmlcatmgr:textproc/xmlcatmgr
diff --git a/www/fswiki/Makefile b/www/fswiki/Makefile
index bc795b9b6f3d..43f708840236 100644
--- a/www/fswiki/Makefile
+++ b/www/fswiki/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www
 MASTER_SITES=	OSDN/fswiki
 DISTNAME=	wiki${PORTVERSION:S|.|_|g}
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	FreeStyle Wiki (perl based wiki clone)
 
 RUN_DEPENDS=	ja-p5-Jcode>=0:japanese/p5-Jcode \
diff --git a/www/mod_asn/Makefile b/www/mod_asn/Makefile
index 7104ac1d3203..f94cf8f5ff2c 100644
--- a/www/mod_asn/Makefile
+++ b/www/mod_asn/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www
 MASTER_SITES=	LOCAL/kuriyama \
 		http://mirrorbrain.org/files/releases/
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Look up the AS and network prefix of IP address
 
 LICENSE=	APACHE20
diff --git a/www/mod_auth_tkt/Makefile b/www/mod_auth_tkt/Makefile
index f3979e38efc0..b138c50dfe83 100644
--- a/www/mod_auth_tkt/Makefile
+++ b/www/mod_auth_tkt/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www
 MASTER_SITES=	LOCAL/kuriyama \
 		http://www.openfusion.com.au/labs/dist/mod_auth_tkt/
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight single-sign-on authentication module for apache
 
 USES=		apache:2.2+ shebangfix
diff --git a/www/mod_reproxy/Makefile b/www/mod_reproxy/Makefile
index 5b260174bc2e..96e61aa0df76 100644
--- a/www/mod_reproxy/Makefile
+++ b/www/mod_reproxy/Makefile
@@ -3,7 +3,7 @@ PORTVERSION=	0.02.20110826
 CATEGORIES=	www
 MASTER_SITES=	LOCAL/kuriyama
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Apache module to support x-reproxy-url header
 
 LICENSE=	APACHE20
diff --git a/www/p5-Amon2-Lite/Makefile b/www/p5-Amon2-Lite/Makefile
index 6a9e58ab94f0..25973cfecf1f 100644
--- a/www/p5-Amon2-Lite/Makefile
+++ b/www/p5-Amon2-Lite/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Sinatra-ish framework on Amon2!
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Amon2-Plugin-LogDispatch/Makefile b/www/p5-Amon2-Plugin-LogDispatch/Makefile
index 5eab6a2ae82f..460579d326e2 100644
--- a/www/p5-Amon2-Plugin-LogDispatch/Makefile
+++ b/www/p5-Amon2-Plugin-LogDispatch/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Log::Dispatch glue for Amon2
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile b/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
index 0f9a055740ea..147508c9043b 100644
--- a/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
+++ b/www/p5-Amon2-Plugin-Web-CSRFDefender/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Amon2 anti CSRF filter
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile b/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
index 8d228f559269..18a469c5f135 100644
--- a/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
+++ b/www/p5-Amon2-Plugin-Web-MobileAgent/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of HTTP::MobileAgent plugin for Amon2
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Amon2/Makefile b/www/p5-Amon2/Makefile
index d3d7a772ee29..226aaa1babd8 100644
--- a/www/p5-Amon2/Makefile
+++ b/www/p5-Amon2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for lightweight web application framework
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile b/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
index 8356e3e02f2e..d12b8fd21f87 100644
--- a/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
+++ b/www/p5-AnyEvent-HTTP-LWP-UserAgent/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for LWP::UserAgent interface using AnyEvent::HTTP
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-AnyEvent-ReverseHTTP/Makefile b/www/p5-AnyEvent-ReverseHTTP/Makefile
index 9097d7d2f7cc..d0cf688825df 100644
--- a/www/p5-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-AnyEvent-ReverseHTTP/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of reversehttp for AnyEvent
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-AnyEvent-SCGI/Makefile b/www/p5-AnyEvent-SCGI/Makefile
index 7582367ee3d2..f108b41fee11 100644
--- a/www/p5-AnyEvent-SCGI/Makefile
+++ b/www/p5-AnyEvent-SCGI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Event based SCGI server
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Apache-LogFormat-Compiler/Makefile b/www/p5-Apache-LogFormat-Compiler/Makefile
index c77343140cc1..aec80ba6643c 100644
--- a/www/p5-Apache-LogFormat-Compiler/Makefile
+++ b/www/p5-Apache-LogFormat-Compiler/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to compile a log format string to perl-code
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Ark/Makefile b/www/p5-Ark/Makefile
index dc75b85d9e42..3ea5a277c73f 100644
--- a/www/p5-Ark/Makefile
+++ b/www/p5-Ark/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	GHC LOCAL/kuriyama
 PKGNAMEPREFIX=	p5-
 DISTNAME=	Ark-0.001000_001
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl web application framework
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-CGI-Application-PSGI/Makefile b/www/p5-CGI-Application-PSGI/Makefile
index 41ca28d12622..fb354c62f3aa 100644
--- a/www/p5-CGI-Application-PSGI/Makefile
+++ b/www/p5-CGI-Application-PSGI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of PSGI Adapter for CGI::Application
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-CGI-Compile/Makefile b/www/p5-CGI-Compile/Makefile
index 4c727b840c4d..d35273c8d3ce 100644
--- a/www/p5-CGI-Compile/Makefile
+++ b/www/p5-CGI-Compile/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to compile .cgi scripts to a code reference
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-CGI-Emulate-PSGI/Makefile b/www/p5-CGI-Emulate-PSGI/Makefile
index fe4e880ad5e1..63bec1d865a5 100644
--- a/www/p5-CGI-Emulate-PSGI/Makefile
+++ b/www/p5-CGI-Emulate-PSGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of PSGI adapter for CGI
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-CGI-PSGI/Makefile b/www/p5-CGI-PSGI/Makefile
index b0b0f7833f7c..5557286a7dd2 100644
--- a/www/p5-CGI-PSGI/Makefile
+++ b/www/p5-CGI-PSGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to enable CGI.pm applications to adapt PSGI
 
 USES=		perl5
diff --git a/www/p5-CGI-Pager/Makefile b/www/p5-CGI-Pager/Makefile
index e68865b6732f..2170811e46a2 100644
--- a/www/p5-CGI-Pager/Makefile
+++ b/www/p5-CGI-Pager/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to generate HTML pagination linkage easily
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-CGI-Session/Makefile b/www/p5-CGI-Session/Makefile
index a3a492d691ba..1c80d0de05e5 100644
--- a/www/p5-CGI-Session/Makefile
+++ b/www/p5-CGI-Session/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARKSTOS
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for persistent session management
 
 USES=		perl5
diff --git a/www/p5-Catalyst-Engine-PSGI/Makefile b/www/p5-Catalyst-Engine-PSGI/Makefile
index 16f3e6ee2443..6bca90bd62b3 100644
--- a/www/p5-Catalyst-Engine-PSGI/Makefile
+++ b/www/p5-Catalyst-Engine-PSGI/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of PSGI engine for Catalyst
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Catalyst-Model-CDBI-Plain/Makefile b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
index d5456d1c711b..ecc13d224d31 100644
--- a/www/p5-Catalyst-Model-CDBI-Plain/Makefile
+++ b/www/p5-Catalyst-Model-CDBI-Plain/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst plain base class for Class::DBI models
 
 BUILD_DEPENDS=	p5-Class-DBI>0:databases/p5-Class-DBI \
diff --git a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
index 6b54f82ab97a..9bed0c68fb1b 100644
--- a/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
+++ b/www/p5-Catalyst-Plugin-Session-State-Cookie/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Stores a Catalyst Session in a Cookie
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Catalyst-View-JSON/Makefile b/www/p5-Catalyst-View-JSON/Makefile
index 99cdb2a32a11..c097f678b4c7 100644
--- a/www/p5-Catalyst-View-JSON/Makefile
+++ b/www/p5-Catalyst-View-JSON/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Catalyst View handler that returns stash data in JSON format
 
 LICENSE=	ART10
diff --git a/www/p5-Catalyst-View-REST-XML/Makefile b/www/p5-Catalyst-View-REST-XML/Makefile
index 25cb91afed16..efffe97a15df 100644
--- a/www/p5-Catalyst-View-REST-XML/Makefile
+++ b/www/p5-Catalyst-View-REST-XML/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Catalyst XML View Class
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Catalyst-View-XML-Simple/Makefile b/www/p5-Catalyst-View-XML-Simple/Makefile
index a4393ac048a0..581b7d05fbc9 100644
--- a/www/p5-Catalyst-View-XML-Simple/Makefile
+++ b/www/p5-Catalyst-View-XML-Simple/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	LOCAL/kuriyama
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Catalyst XML View Class
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Cookie-Baker/Makefile b/www/p5-Cookie-Baker/Makefile
index 92559fe2ed37..0db16190f6d2 100644
--- a/www/p5-Cookie-Baker/Makefile
+++ b/www/p5-Cookie-Baker/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for cookie string generator/parser
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Corona/Makefile b/www/p5-Corona/Makefile
index 8c257536afed..7e549eccd5dc 100644
--- a/www/p5-Corona/Makefile
+++ b/www/p5-Corona/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Coro based PSGI web server
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Dancer-Plugin-ValidationClass/Makefile b/www/p5-Dancer-Plugin-ValidationClass/Makefile
index e7202fce2b19..915aae369ba9 100644
--- a/www/p5-Dancer-Plugin-ValidationClass/Makefile
+++ b/www/p5-Dancer-Plugin-ValidationClass/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AWNCORP
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for centralized input validation for Dancer
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Dancer-Session-Cookie/Makefile b/www/p5-Dancer-Session-Cookie/Makefile
index 4055f7c2f024..9c3d1e337d30 100644
--- a/www/p5-Dancer-Session-Cookie/Makefile
+++ b/www/p5-Dancer-Session-Cookie/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for encrypted cookie-based session backend for Dancer
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Dancer/Makefile b/www/p5-Dancer/Makefile
index 9a722890da53..954799937e98 100644
--- a/www/p5-Dancer/Makefile
+++ b/www/p5-Dancer/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BIGPRESH
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for minimal-effort oriented web application framework
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-FCGI-Client/Makefile b/www/p5-FCGI-Client/Makefile
index faa00709d353..9f1af6f8170d 100644
--- a/www/p5-FCGI-Client/Makefile
+++ b/www/p5-FCGI-Client/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for fastcgi protocol client library
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Facebook-Graph/Makefile b/www/p5-Facebook-Graph/Makefile
index aa0822284309..aa267379d15e 100644
--- a/www/p5-Facebook-Graph/Makefile
+++ b/www/p5-Facebook-Graph/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:RIZEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to integrate your apps with Facebook
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Flea/Makefile b/www/p5-Flea/Makefile
index 6c69a7e1527d..dd901d7b4d47 100644
--- a/www/p5-Flea/Makefile
+++ b/www/p5-Flea/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FRODWITH
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for minimalistic sugar for your Plack
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Fliggy/Makefile b/www/p5-Fliggy/Makefile
index 173d262c9aff..619ef8b92a0d 100644
--- a/www/p5-Fliggy/Makefile
+++ b/www/p5-Fliggy/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:VTI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Fliggy: Twiggy with inlined flash policy server
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Furl/Makefile b/www/p5-Furl/Makefile
index d2d8ac02efae..e81489b4a0bb 100644
--- a/www/p5-Furl/Makefile
+++ b/www/p5-Furl/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of lightning-fast URL fetcher
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-FurlX-Coro/Makefile b/www/p5-FurlX-Coro/Makefile
index 9701417975fa..ca32fd21ec07 100644
--- a/www/p5-FurlX-Coro/Makefile
+++ b/www/p5-FurlX-Coro/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:GFUJI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for multiple HTTP requests with Coro
 
 RUN_DEPENDS=	\
diff --git a/www/p5-GunghoX-FollowLinks/Makefile b/www/p5-GunghoX-FollowLinks/Makefile
index 4f1b8e0ad979..c6af25c2ba5b 100644
--- a/www/p5-GunghoX-FollowLinks/Makefile
+++ b/www/p5-GunghoX-FollowLinks/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to follow links within responses for Gungho
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTML-ExtractContent/Makefile b/www/p5-HTML-ExtractContent/Makefile
index 9f2756a9f12b..f5284de31f99 100644
--- a/www/p5-HTML-ExtractContent/Makefile
+++ b/www/p5-HTML-ExtractContent/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TARAO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for HTML content extractor with scoring heuristics
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTML-FillInForm-Lite/Makefile b/www/p5-HTML-FillInForm-Lite/Makefile
index aa17cbb28325..dbc8d938a071 100644
--- a/www/p5-HTML-FillInForm-Lite/Makefile
+++ b/www/p5-HTML-FillInForm-Lite/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for lightweight FillInForm module in Pure Perl
 
 USES=		perl5
diff --git a/www/p5-HTML-Restrict/Makefile b/www/p5-HTML-Restrict/Makefile
index 7d7698cc0868..99933867da16 100644
--- a/www/p5-HTML-Restrict/Makefile
+++ b/www/p5-HTML-Restrict/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to strip unwanted HTML tags and attributes
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTML-Shakan/Makefile b/www/p5-HTML-Shakan/Makefile
index c642ec812fa4..a71f7d62a355 100644
--- a/www/p5-HTML-Shakan/Makefile
+++ b/www/p5-HTML-Shakan/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:SONGMU
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of form html generator/validator
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
index cdde1094a58d..3dd1a6664c19 100644
--- a/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
+++ b/www/p5-HTML-StickyQuery-DoCoMoGUID/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:YAPPO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to add guid in query for DoCoMo imode
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTML-Template-Pro/Makefile b/www/p5-HTML-Template-Pro/Makefile
index f4404fdf9549..dd2b80e38a2e 100644
--- a/www/p5-HTML-Template-Pro/Makefile
+++ b/www/p5-HTML-Template-Pro/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to use HTML Templates from CGI scripts
 
 RUN_DEPENDS=	\
diff --git a/www/p5-HTML-Template/Makefile b/www/p5-HTML-Template/Makefile
index 658709c141f6..731e481c7a88 100644
--- a/www/p5-HTML-Template/Makefile
+++ b/www/p5-HTML-Template/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to use HTML Templates from CGI scripts
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-Engine-Middleware/Makefile b/www/p5-HTTP-Engine-Middleware/Makefile
index 8167c5288d89..6a9a7e7f74c6 100644
--- a/www/p5-HTTP-Engine-Middleware/Makefile
+++ b/www/p5-HTTP-Engine-Middleware/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for official distribution of HTTP::Engine
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTTP-Engine/Makefile b/www/p5-HTTP-Engine/Makefile
index 3320968a2c60..75232047992a 100644
--- a/www/p5-HTTP-Engine/Makefile
+++ b/www/p5-HTTP-Engine/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for HTTP Server Engine Drivers
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-Exception/Makefile b/www/p5-HTTP-Exception/Makefile
index 68202a735e55..04f066056945 100644
--- a/www/p5-HTTP-Exception/Makefile
+++ b/www/p5-HTTP-Exception/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to throw HTTP-Errors as (Exception::Class-) Exceptions
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-Headers-Fast/Makefile b/www/p5-HTTP-Headers-Fast/Makefile
index 436e6f85bca4..bd99200e81d9 100644
--- a/www/p5-HTTP-Headers-Fast/Makefile
+++ b/www/p5-HTTP-Headers-Fast/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for faster implementation of HTTP::Headers
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
index 32796bad634d..2cca77095a42 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to plugin Encode::JP::Mobile for HTTP::MobileAgent
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
index 0d0dd2aa2719..8d3f7f2504a9 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Locator/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Mobile location information plugin for p5-HTTP-MobileAgent
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTTP-Parser-XS/Makefile b/www/p5-HTTP-Parser-XS/Makefile
index 2185ac7ace1c..eb9053a77e63 100644
--- a/www/p5-HTTP-Parser-XS/Makefile
+++ b/www/p5-HTTP-Parser-XS/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of fast, primitive HTTP request parser
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-Router/Makefile b/www/p5-HTTP-Router/Makefile
index 97b4a1f66dd6..a32c6ce3113a 100644
--- a/www/p5-HTTP-Router/Makefile
+++ b/www/p5-HTTP-Router/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of Yet Another Path Router for HTTP
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTTP-Session-State-MobileAgentID/Makefile b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
index 2b903e12ea2b..acaf05aa6d46 100644
--- a/www/p5-HTTP-Session-State-MobileAgentID/Makefile
+++ b/www/p5-HTTP-Session-State-MobileAgentID/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to maintain session IDs using mobile phone unique id
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTTP-Session-Store-DBI/Makefile b/www/p5-HTTP-Session-Store-DBI/Makefile
index c809c78b30f0..50e5635e1dda 100644
--- a/www/p5-HTTP-Session-Store-DBI/Makefile
+++ b/www/p5-HTTP-Session-Store-DBI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to store session data in DBI for HTTP::Session
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-HTTP-Session/Makefile b/www/p5-HTTP-Session/Makefile
index de4af8fe92d9..61db61494b75 100644
--- a/www/p5-HTTP-Session/Makefile
+++ b/www/p5-HTTP-Session/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:TOKUHIROM
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of yet another session manager
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-Session2/Makefile b/www/p5-HTTP-Session2/Makefile
index cc6bb9835d5d..ac1ff2279a8e 100644
--- a/www/p5-HTTP-Session2/Makefile
+++ b/www/p5-HTTP-Session2/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for HTTP session management
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-HTTP-WebTest/Makefile b/www/p5-HTTP-WebTest/Makefile
index bbc3f00beb58..c345b8c9e1cb 100644
--- a/www/p5-HTTP-WebTest/Makefile
+++ b/www/p5-HTTP-WebTest/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Tests remote URLs or local web files
 
 BUILD_DEPENDS=	\
diff --git a/www/p5-HTTPD-Log-Filter/Makefile b/www/p5-HTTPD-Log-Filter/Makefile
index e2fe21a82f0f..fa40b078fbe4 100644
--- a/www/p5-HTTPD-Log-Filter/Makefile
+++ b/www/p5-HTTPD-Log-Filter/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:AWRIGLEY
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module to filter entries out of an httpd log
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-I18N-AcceptLanguage/Makefile b/www/p5-I18N-AcceptLanguage/Makefile
index 0c227d96af8f..7c8330615156 100644
--- a/www/p5-I18N-AcceptLanguage/Makefile
+++ b/www/p5-I18N-AcceptLanguage/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to matches language preference (HTTP Accept-Language)
 
 USES=		perl5
diff --git a/www/p5-LWP-Authen-OAuth/Makefile b/www/p5-LWP-Authen-OAuth/Makefile
index 8891b9367c87..b56bc9f42d1a 100644
--- a/www/p5-LWP-Authen-OAuth/Makefile
+++ b/www/p5-LWP-Authen-OAuth/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to generate signed OAuth requests
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-LWP-Protocol-PSGI/Makefile b/www/p5-LWP-Protocol-PSGI/Makefile
index 87f9614ae3b3..2fb349676bde 100644
--- a/www/p5-LWP-Protocol-PSGI/Makefile
+++ b/www/p5-LWP-Protocol-PSGI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to override LWP HTTP/HTTPS backend with your PSGI app
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Monoceros/Makefile b/www/p5-Monoceros/Makefile
index eb960ed939c7..0f4f432b6feb 100644
--- a/www/p5-Monoceros/Makefile
+++ b/www/p5-Monoceros/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZEBURO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	PSGI/Plack server w/ event driven connection manager, prefork workers
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Net-FastCGI/Makefile b/www/p5-Net-FastCGI/Makefile
index 7ce66ad5c2df..e01c437878e7 100644
--- a/www/p5-Net-FastCGI/Makefile
+++ b/www/p5-Net-FastCGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:CHANSEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for FastCGI Toolkit
 
 TEST_DEPENDS=	p5-Test-Exception>=0:devel/p5-Test-Exception \
diff --git a/www/p5-Net-STF-Client/Makefile b/www/p5-Net-STF-Client/Makefile
index 2de665f95047..d6f0b2e1cd0f 100644
--- a/www/p5-Net-STF-Client/Makefile
+++ b/www/p5-Net-STF-Client/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for STF Client
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-POE-Component-Server-PSGI/Makefile b/www/p5-POE-Component-Server-PSGI/Makefile
index d053e285c0f5..5fbd40162ade 100644
--- a/www/p5-POE-Component-Server-PSGI/Makefile
+++ b/www/p5-POE-Component-Server-PSGI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to PSGI Server implementation for POE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-POEx-Role-PSGIServer/Makefile b/www/p5-POEx-Role-PSGIServer/Makefile
index b4bb79029bb2..ba1c328e1f3b 100644
--- a/www/p5-POEx-Role-PSGIServer/Makefile
+++ b/www/p5-POEx-Role-PSGIServer/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:FRODWITH
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for encapsulated PSGI server behaviors for POE
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-PSGI/Makefile b/www/p5-PSGI/Makefile
index 8b89a8e7b9bc..f15229513d32 100644
--- a/www/p5-PSGI/Makefile
+++ b/www/p5-PSGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Pod documentation for Perl Web Server Gateway Interface Specification
 
 USES=	perl5
diff --git a/www/p5-Path-Class-URI/Makefile b/www/p5-Path-Class-URI/Makefile
index 2cb1837d6b8c..973faec397ef 100644
--- a/www/p5-Path-Class-URI/Makefile
+++ b/www/p5-Path-Class-URI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for serialize Path::Class objects as file:// URI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Perlbal-Plugin-PSGI/Makefile b/www/p5-Perlbal-Plugin-PSGI/Makefile
index a3d63b565e0f..28be135e9b8a 100644
--- a/www/p5-Perlbal-Plugin-PSGI/Makefile
+++ b/www/p5-Perlbal-Plugin-PSGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for PSGI web server on Perlbal
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-App-Proxy/Makefile b/www/p5-Plack-App-Proxy/Makefile
index 5009a76cf9ac..33db987f553c 100644
--- a/www/p5-Plack-App-Proxy/Makefile
+++ b/www/p5-Plack-App-Proxy/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:LEEDO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Plack extension for proxy requests
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Builder-Conditionals/Makefile b/www/p5-Plack-Builder-Conditionals/Makefile
index a2d527a81f68..c990b08f340c 100644
--- a/www/p5-Plack-Builder-Conditionals/Makefile
+++ b/www/p5-Plack-Builder-Conditionals/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to extend Plack::Builder
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile b/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
index 71b4bb781cd1..f7141f6f08fc 100644
--- a/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-HTTPD/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Plack handler to run PSGI apps on AnyEvent::HTTPD
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
index 85e42df9d335..024e6d56b434 100644
--- a/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-ReverseHTTP/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to reversehttp gateway for PSGI application
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
index 39824cabc322..ed77961e71b4 100644
--- a/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
+++ b/www/p5-Plack-Handler-AnyEvent-SCGI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for PSGI handler on AnyEvent::SCGI
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Handler-CLI/Makefile b/www/p5-Plack-Handler-CLI/Makefile
index 067c9f1fbb41..8f6e72453c27 100644
--- a/www/p5-Plack-Handler-CLI/Makefile
+++ b/www/p5-Plack-Handler-CLI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for command line interface to PSGI applications
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Handler-SCGI/Makefile b/www/p5-Plack-Handler-SCGI/Makefile
index a491f668fdd4..1bfc14de57c7 100644
--- a/www/p5-Plack-Handler-SCGI/Makefile
+++ b/www/p5-Plack-Handler-SCGI/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for PSGI handler on SCGI daemon
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-AMF/Makefile b/www/p5-Plack-Middleware-AMF/Makefile
index 2dfbd980eaf3..0d0718cc92bc 100644
--- a/www/p5-Plack-Middleware-AMF/Makefile
+++ b/www/p5-Plack-Middleware-AMF/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to use AMF with Plack
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-AddDefaultCharset/Makefile b/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
index 9f9c9a10c573..81e879147a25 100644
--- a/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
+++ b/www/p5-Plack-Middleware-AddDefaultCharset/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to port Apache2 AddDefaultCharset for Plack
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-Auth-Digest/Makefile b/www/p5-Plack-Middleware-Auth-Digest/Makefile
index b6e29e155bb6..2eaf3c2078fb 100644
--- a/www/p5-Plack-Middleware-Auth-Digest/Makefile
+++ b/www/p5-Plack-Middleware-Auth-Digest/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Plack extension for digest authentication
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Middleware-AutoRefresh/Makefile b/www/p5-Plack-Middleware-AutoRefresh/Makefile
index 6a4e608c8319..e9b1c65c5503 100644
--- a/www/p5-Plack-Middleware-AutoRefresh/Makefile
+++ b/www/p5-Plack-Middleware-AutoRefresh/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to reload pages when files are modified
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-ConsoleLogger/Makefile b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
index 56a3df8374f7..38a345223c40 100644
--- a/www/p5-Plack-Middleware-ConsoleLogger/Makefile
+++ b/www/p5-Plack-Middleware-ConsoleLogger/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to write logs to Firebug or Webkit Inspector
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Middleware-Debug/Makefile b/www/p5-Plack-Middleware-Debug/Makefile
index 4b0c4bceaeb8..d430ee8b65cd 100644
--- a/www/p5-Plack-Middleware-Debug/Makefile
+++ b/www/p5-Plack-Middleware-Debug/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to display information about current request/response
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-Deflater/Makefile b/www/p5-Plack-Middleware-Deflater/Makefile
index 8b4431a644a3..b7c735a268ad 100644
--- a/www/p5-Plack-Middleware-Deflater/Makefile
+++ b/www/p5-Plack-Middleware-Deflater/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZEBURO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to compress response body with Gzip or Deflate
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-File-Sass/Makefile b/www/p5-Plack-Middleware-File-Sass/Makefile
index ed460c558c43..21deb3aeb353 100644
--- a/www/p5-Plack-Middleware-File-Sass/Makefile
+++ b/www/p5-Plack-Middleware-File-Sass/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Sass support for all Plack frameworks
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-Header/Makefile b/www/p5-Plack-Middleware-Header/Makefile
index 4b7af50b66ab..803ea39807de 100644
--- a/www/p5-Plack-Middleware-Header/Makefile
+++ b/www/p5-Plack-Middleware-Header/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to modify HTTP response headers
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-IEnosniff/Makefile b/www/p5-Plack-Middleware-IEnosniff/Makefile
index 76785eb09605..62017eefdb36 100644
--- a/www/p5-Plack-Middleware-IEnosniff/Makefile
+++ b/www/p5-Plack-Middleware-IEnosniff/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BAYASHI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to add X-Content-Type-Options:nosniff
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-InteractiveDebugger/Makefile b/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
index c90b031249f3..4bf7259aee50 100644
--- a/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
+++ b/www/p5-Plack-Middleware-InteractiveDebugger/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Awesome Interactive Debugger ala Werkzeug
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Plack-Middleware-JSConcat/Makefile b/www/p5-Plack-Middleware-JSConcat/Makefile
index 18762066ea7a..932ac7858f2e 100644
--- a/www/p5-Plack-Middleware-JSConcat/Makefile
+++ b/www/p5-Plack-Middleware-JSConcat/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to concatenate JavaScripts
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-MemoryUsage/Makefile b/www/p5-Plack-Middleware-MemoryUsage/Makefile
index 7bb75f160ff5..6ce53f4e23a0 100644
--- a/www/p5-Plack-Middleware-MemoryUsage/Makefile
+++ b/www/p5-Plack-Middleware-MemoryUsage/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for measuring process memory
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Plack-Middleware-Precompressed/Makefile b/www/p5-Plack-Middleware-Precompressed/Makefile
index 32dc332cf4d6..b6180c92b6e7 100644
--- a/www/p5-Plack-Middleware-Precompressed/Makefile
+++ b/www/p5-Plack-Middleware-Precompressed/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:ARISTOTLE
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to serve pre-gzipped content to capable clients
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Middleware-Reproxy/Makefile b/www/p5-Plack-Middleware-Reproxy/Makefile
index 27420e6eb09b..06594e605ac6 100644
--- a/www/p5-Plack-Middleware-Reproxy/Makefile
+++ b/www/p5-Plack-Middleware-Reproxy/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to handle X-Reproxy-URL from within Plack
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-ReverseProxy/Makefile b/www/p5-Plack-Middleware-ReverseProxy/Makefile
index b233dd359eb9..41e539ebb223 100644
--- a/www/p5-Plack-Middleware-ReverseProxy/Makefile
+++ b/www/p5-Plack-Middleware-ReverseProxy/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to support app to run as a reverse proxy backend
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile b/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
index d66913b26067..b4b23d59acf2 100644
--- a/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
+++ b/www/p5-Plack-Middleware-ServerStatus-Lite/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Plack middleware to show server status like Apache mod_status
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Middleware-Session/Makefile b/www/p5-Plack-Middleware-Session/Makefile
index baf6cef8a314..81c817615c7a 100644
--- a/www/p5-Plack-Middleware-Session/Makefile
+++ b/www/p5-Plack-Middleware-Session/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for session management middleware for Plack
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Middleware-SocketIO/Makefile b/www/p5-Plack-Middleware-SocketIO/Makefile
index 2b4294f39dbe..132d651c36c3 100644
--- a/www/p5-Plack-Middleware-SocketIO/Makefile
+++ b/www/p5-Plack-Middleware-SocketIO/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Socket.IO Plack middleware
 
 LICENSE=	ART20
diff --git a/www/p5-Plack-Middleware-Status/Makefile b/www/p5-Plack-Middleware-Status/Makefile
index af799c9b2e1f..69feee0b0a26 100644
--- a/www/p5-Plack-Middleware-Status/Makefile
+++ b/www/p5-Plack-Middleware-Status/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to map urls to status code-driven responses for Plack
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Middleware-Throttle/Makefile b/www/p5-Plack-Middleware-Throttle/Makefile
index d372ce94ea7a..c370bc3ec6b1 100644
--- a/www/p5-Plack-Middleware-Throttle/Makefile
+++ b/www/p5-Plack-Middleware-Throttle/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of rate-limiting incoming HTTP requests for Plack
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Server-Coro/Makefile b/www/p5-Plack-Server-Coro/Makefile
index c0ba6f9c535a..26ae9e95224b 100644
--- a/www/p5-Plack-Server-Coro/Makefile
+++ b/www/p5-Plack-Server-Coro/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Coro cooperative multithread web server
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Plack-Server-POE/Makefile b/www/p5-Plack-Server-POE/Makefile
index d1610a1a0301..662a9c89be87 100644
--- a/www/p5-Plack-Server-POE/Makefile
+++ b/www/p5-Plack-Server-POE/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Plack Server implementation for POE
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack-Server-ReverseHTTP/Makefile b/www/p5-Plack-Server-ReverseHTTP/Makefile
index 22ca67dbb2af..445a86e5da80 100644
--- a/www/p5-Plack-Server-ReverseHTTP/Makefile
+++ b/www/p5-Plack-Server-ReverseHTTP/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of reversehttp gateway for PSGI application
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Plack/Makefile b/www/p5-Plack/Makefile
index 3a5278136918..7565d1c9930b 100644
--- a/www/p5-Plack/Makefile
+++ b/www/p5-Plack/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of PSGI reference implementation and utilities
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Router-Boom/Makefile b/www/p5-Router-Boom/Makefile
index d45e56ce7e0e..128a5db566fe 100644
--- a/www/p5-Router-Boom/Makefile
+++ b/www/p5-Router-Boom/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for fast routing engine for web applications
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Router-Simple-Sinatraish/Makefile b/www/p5-Router-Simple-Sinatraish/Makefile
index 94057ba4554e..14f308dc8076 100644
--- a/www/p5-Router-Simple-Sinatraish/Makefile
+++ b/www/p5-Router-Simple-Sinatraish/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for Sinatra-ish routers on Router::Simple
 
 RUN_DEPENDS=	\
diff --git a/www/p5-SOAP-Transport-HTTP-Plack/Makefile b/www/p5-SOAP-Transport-HTTP-Plack/Makefile
index eeb491f98133..404f19727b8a 100644
--- a/www/p5-SOAP-Transport-HTTP-Plack/Makefile
+++ b/www/p5-SOAP-Transport-HTTP-Plack/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension SOAP::Lite transport for Plack
 
 RUN_DEPENDS=	\
diff --git a/www/p5-STF-Dispatcher-PSGI/Makefile b/www/p5-STF-Dispatcher-PSGI/Makefile
index 28ffa8ad763f..d3cd42808be8 100644
--- a/www/p5-STF-Dispatcher-PSGI/Makefile
+++ b/www/p5-STF-Dispatcher-PSGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DMAKI
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for pluggable STF dispatcher interface
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Session-Storage-Secure/Makefile b/www/p5-Session-Storage-Secure/Makefile
index d12b6f0ea39e..7f623fc178b5 100644
--- a/www/p5-Session-Storage-Secure/Makefile
+++ b/www/p5-Session-Storage-Secure/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:DAGOLDEN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for encrypted, serialized session data with integrity
 
 LICENSE=	APACHE20
diff --git a/www/p5-Squatting-On-PSGI/Makefile b/www/p5-Squatting-On-PSGI/Makefile
index 09f9a1a36de5..dc7aa9cf3edf 100644
--- a/www/p5-Squatting-On-PSGI/Makefile
+++ b/www/p5-Squatting-On-PSGI/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:BEPPU
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to run Squatting app on PSGI
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Starlet/Makefile b/www/p5-Starlet/Makefile
index 1140f5fbf0a4..474bdfa4ee25 100644
--- a/www/p5-Starlet/Makefile
+++ b/www/p5-Starlet/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:KAZUHO
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for standalone HTTP/1.0 server
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Starman/Makefile b/www/p5-Starman/Makefile
index eaa1981dad73..4204add9b38f 100644
--- a/www/p5-Starman/Makefile
+++ b/www/p5-Starman/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for high-performance preforking PSGI web server
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-Task-Plack/Makefile b/www/p5-Task-Plack/Makefile
index a7f3631d2542..cb3acae16004 100644
--- a/www/p5-Task-Plack/Makefile
+++ b/www/p5-Task-Plack/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl module bundle for Plack
 
 USES=		perl5
diff --git a/www/p5-Template-Plugin-Comma/Makefile b/www/p5-Template-Plugin-Comma/Makefile
index c299b1ab0b07..81abd43bc530 100644
--- a/www/p5-Template-Plugin-Comma/Makefile
+++ b/www/p5-Template-Plugin-Comma/Makefile
@@ -7,7 +7,7 @@ CATEGORIES=	www textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	TT Plugin to commify numbers
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Template-Plugin-JSON/Makefile b/www/p5-Template-Plugin-JSON/Makefile
index 327699df7eff..94f395d1b225 100644
--- a/www/p5-Template-Plugin-JSON/Makefile
+++ b/www/p5-Template-Plugin-JSON/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Adds a .json vmethod for all TT values
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Template-Plugin-VMethods/Makefile b/www/p5-Template-Plugin-VMethods/Makefile
index b3ccdd433101..295d48cc5d45 100644
--- a/www/p5-Template-Plugin-VMethods/Makefile
+++ b/www/p5-Template-Plugin-VMethods/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Install vmethods for Template-Toolkit
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Template-Stash-AutoEscape/Makefile b/www/p5-Template-Stash-AutoEscape/Makefile
index 86f3073de740..623ef1d3ebbe 100644
--- a/www/p5-Template-Stash-AutoEscape/Makefile
+++ b/www/p5-Template-Stash-AutoEscape/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to escape automatically in Template-Toolkit
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Tenjin/Makefile b/www/p5-Tenjin/Makefile
index f391c1f6dc0a..29b6ec854ade 100644
--- a/www/p5-Tenjin/Makefile
+++ b/www/p5-Tenjin/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for fast templating engine with support for embedded
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/www/p5-Twiggy-TLS/Makefile b/www/p5-Twiggy-TLS/Makefile
index 002a40069e4a..b7766afe2df3 100644
--- a/www/p5-Twiggy-TLS/Makefile
+++ b/www/p5-Twiggy-TLS/Makefile
@@ -6,7 +6,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:UNDEF
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension to extend Twiggy supporting TLS
 
 RUN_DEPENDS=	\
diff --git a/www/p5-Twiggy/Makefile b/www/p5-Twiggy/Makefile
index 9580f90151e7..79b36f6fa20a 100644
--- a/www/p5-Twiggy/Makefile
+++ b/www/p5-Twiggy/Makefile
@@ -5,7 +5,7 @@ MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MIYAGAWA
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension of AnyEvent HTTP server for PSGI (like Thin)
 
 LICENSE=	ART10 GPLv1+
diff --git a/www/p5-jQuery-File-Upload/Makefile b/www/p5-jQuery-File-Upload/Makefile
index 9e6921e276f7..db462ff54819 100644
--- a/www/p5-jQuery-File-Upload/Makefile
+++ b/www/p5-jQuery-File-Upload/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl extension for jQuery File Upload plugin
 
 RUN_DEPENDS=	\
diff --git a/www/rubygem-acts-as-taggable-on/Makefile b/www/rubygem-acts-as-taggable-on/Makefile
index 1aef381c16d7..7f05ce60fbc2 100644
--- a/www/rubygem-acts-as-taggable-on/Makefile
+++ b/www/rubygem-acts-as-taggable-on/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	0
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tag a single model on several contexts
 
 LICENSE=	MIT
diff --git a/x11-clocks/asclock-xlib/Makefile b/x11-clocks/asclock-xlib/Makefile
index 66bc276bbeba..b98502d85ea4 100644
--- a/x11-clocks/asclock-xlib/Makefile
+++ b/x11-clocks/asclock-xlib/Makefile
@@ -4,7 +4,7 @@ PORTREVISION=	4
 CATEGORIES=	x11-clocks afterstep windowmaker
 MASTER_SITES=	LOCAL/kuriyama
 
-MAINTAINER=	kuriyama@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	New flavor of asclock
 
 MAKE_JOBS_UNSAFE=	yes