Bump version to 5.21.5

22 files changed, 137 insertions, 137 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index ca36a553dc..48b1d87444 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -32,12 +32,12 @@ alignbytes='4'
 ansi2knr=''
 aphostname='/bin/hostname'
 api_revision='5'
-api_subversion='4'
+api_subversion='5'
 api_version='21'
-api_versionstring='5.21.4'
+api_versionstring='5.21.5'
 ar='ar'
-archlib='/usr/lib/perl5/5.21.4/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.21.4/armv4l-linux'
+archlib='/usr/lib/perl5/5.21.5/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.21.5/armv4l-linux'
 archname64=''
 archname='armv4l-linux'
 archobjs=''
@@ -56,7 +56,7 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags='-fpic'
-ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.21.4/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.21.5/armv4l-linux/CORE'
 ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='arm-linux-gcc'
@@ -749,7 +749,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.21.4/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.21.5/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -757,13 +757,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.21.4'
+installprivlib='./install_me_here/usr/lib/perl5/5.21.5'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.21.4/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.21.5/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.21.4'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.21.5'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -893,8 +893,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.21.4'
-privlibexp='/usr/lib/perl5/5.21.4'
+privlib='/usr/lib/perl5/5.21.5'
+privlibexp='/usr/lib/perl5/5.21.5'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -959,17 +959,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
 sig_size='68'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.21.4/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.21.4/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.21.5/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.21.5/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.21.4'
+sitelib='/usr/lib/perl5/site_perl/5.21.5'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.21.4'
+sitelibexp='/usr/lib/perl5/site_perl/5.21.5'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1008,7 +1008,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='4'
+subversion='5'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1100,8 +1100,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.21.4'
-version_patchlevel_string='version 21 subversion 4'
+version='5.21.5'
+version_patchlevel_string='version 21 subversion 5'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1115,9 +1115,9 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=21
-PERL_SUBVERSION=4
+PERL_SUBVERSION=5
 PERL_API_REVISION=5
 PERL_API_VERSION=21
-PERL_API_SUBVERSION=4
+PERL_API_SUBVERSION=5
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 1f91767e50..5d0798c77f 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -32,12 +32,12 @@ alignbytes='4'
 ansi2knr=''
 aphostname='/bin/hostname'
 api_revision='5'
-api_subversion='4'
+api_subversion='5'
 api_version='21'
-api_versionstring='5.21.4'
+api_versionstring='5.21.5'
 ar='ar'
-archlib='/usr/lib/perl5/5.21.4/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.21.4/armv4l-linux'
+archlib='/usr/lib/perl5/5.21.5/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.21.5/armv4l-linux'
 archname64=''
 archname='armv4l-linux'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='arm-none-linux-gnueabi-gcc'
 cccdlflags='-fpic'
-ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.21.4/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.21.5/armv4l-linux/CORE'
 ccflags='-fno-strict-aliasing -I/usr/local/include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccflags_uselargefiles='-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
 ccname='arm-linux-gcc'
@@ -699,7 +699,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.21.4/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.21.5/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -707,13 +707,13 @@ installman1dir='./install_me_here/usr/share/man/man1'
 installman3dir='./install_me_here/usr/share/man/man3'
 installprefix='./install_me_here/usr'
 installprefixexp='./install_me_here/usr'
-installprivlib='./install_me_here/usr/lib/perl5/5.21.4'
+installprivlib='./install_me_here/usr/lib/perl5/5.21.5'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.21.4/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.21.5/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.21.4'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.21.5'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -841,8 +841,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.21.4'
-privlibexp='/usr/lib/perl5/5.21.4'
+privlib='/usr/lib/perl5/5.21.5'
+privlibexp='/usr/lib/perl5/5.21.5'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -903,17 +903,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 6, 17, 29, 31, 0'
 sig_size='68'
 signal_t='void'
-sitearch='/usr/lib/perl5/site_perl/5.21.4/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.21.4/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.21.5/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.21.5/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.21.4'
+sitelib='/usr/lib/perl5/site_perl/5.21.5'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.21.4'
+sitelibexp='/usr/lib/perl5/site_perl/5.21.5'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -950,7 +950,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='4'
+subversion='5'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1035,8 +1035,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.21.4'
-version_patchlevel_string='version 21 subversion 4'
+version='5.21.5'
+version_patchlevel_string='version 21 subversion 5'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1050,9 +1050,9 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=21
-PERL_SUBVERSION=4
+PERL_SUBVERSION=5
 PERL_API_REVISION=5
 PERL_API_VERSION=21
-PERL_API_SUBVERSION=4
+PERL_API_SUBVERSION=5
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/INSTALL b/INSTALL
index 3d0af04525..bef2786dab 100644
--- a/INSTALL
+++ b/INSTALL
@@ -583,7 +583,7 @@ The directories set up by Configure fall into three broad categories.
 
 =item Directories for the perl distribution
 
-By default, Configure will use the following directories for 5.21.4.
+By default, Configure will use the following directories for 5.21.5.
 $version is the full perl version number, including subversion, e.g.
 5.12.3, and $archname is a string like sun4-sunos,
 determined by Configure.  The full definitions of all Configure
@@ -2436,7 +2436,7 @@ http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 
 =head1 Coexistence with earlier versions of perl 5
 
-Perl 5.21.4 is not binary compatible with earlier versions of Perl.
+Perl 5.21.5 is not binary compatible with earlier versions of Perl.
 In other words, you will have to recompile your XS modules.
 
 In general, you can usually safely upgrade from one version of Perl (e.g.
@@ -2510,9 +2510,9 @@ won't interfere with another version.  (The defaults guarantee this for
 libraries after 5.6.0, but not for executables. TODO?)  One convenient
 way to do this is by using a separate prefix for each version, such as
 
-	sh Configure -Dprefix=/opt/perl5.21.4
+	sh Configure -Dprefix=/opt/perl5.21.5
 
-and adding /opt/perl5.21.4/bin to the shell PATH variable.  Such users
+and adding /opt/perl5.21.5/bin to the shell PATH variable.  Such users
 may also wish to add a symbolic link /usr/local/bin/perl so that
 scripts can still start with #!/usr/local/bin/perl.
 
@@ -2527,11 +2527,11 @@ yet.
 
 =head2 Upgrading from 5.21.3 or earlier
 
-B<Perl 5.21.4 may not be binary compatible with Perl 5.21.3 or
+B<Perl 5.21.5 may not be binary compatible with Perl 5.21.4 or
 earlier Perl releases.>  Perl modules having binary parts
 (meaning that a C compiler is used) will have to be recompiled to be
-used with 5.21.4.  If you find you do need to rebuild an extension with
-5.21.4, you may safely do so without disturbing the older
+used with 5.21.5.  If you find you do need to rebuild an extension with
+5.21.5, you may safely do so without disturbing the older
 installations.  (See L<"Coexistence with earlier versions of perl 5">
 above.)
 
@@ -2564,15 +2564,15 @@ Firstly, the bare minimum to run this script
      print("$f\n");
   }
 
-in Linux with perl-5.21.4 is as follows (under $Config{prefix}):
+in Linux with perl-5.21.5 is as follows (under $Config{prefix}):
 
   ./bin/perl
-  ./lib/perl5/5.21.4/strict.pm
-  ./lib/perl5/5.21.4/warnings.pm
-  ./lib/perl5/5.21.4/i686-linux/File/Glob.pm
-  ./lib/perl5/5.21.4/feature.pm
-  ./lib/perl5/5.21.4/XSLoader.pm
-  ./lib/perl5/5.21.4/i686-linux/auto/File/Glob/Glob.so
+  ./lib/perl5/5.21.5/strict.pm
+  ./lib/perl5/5.21.5/warnings.pm
+  ./lib/perl5/5.21.5/i686-linux/File/Glob.pm
+  ./lib/perl5/5.21.5/feature.pm
+  ./lib/perl5/5.21.5/XSLoader.pm
+  ./lib/perl5/5.21.5/i686-linux/auto/File/Glob/Glob.so
 
 Secondly, for perl-5.10.1, the Debian perl-base package contains 591 files,
 (of which 510 are for lib/unicore) totaling about 3.5MB in its i386 version.
diff --git a/META.json b/META.json
index 852d29ed80..47155991d1 100644
--- a/META.json
+++ b/META.json
@@ -124,5 +124,5 @@
          "url" : "http://perl5.git.perl.org/"
       }
    },
-   "version" : "5.021004"
+   "version" : "5.021005"
 }
diff --git a/META.yml b/META.yml
index e964f493bd..8e821a9ce9 100644
--- a/META.yml
+++ b/META.yml
@@ -111,4 +111,4 @@ resources:
   homepage: http://www.perl.org/
   license: http://dev.perl.org/licenses/
   repository: http://perl5.git.perl.org/
-version: '5.021004'
+version: '5.021005'
diff --git a/NetWare/Makefile b/NetWare/Makefile
index 4ba4d3dc4e..cd85b86672 100644
--- a/NetWare/Makefile
+++ b/NetWare/Makefile
@@ -86,7 +86,7 @@ NLM_VERSION    = 3,20,0
 
 
 # Here comes the CW tools - TO BE FILLED TO BUILD WITH CW -
-MODULE_DESC     = "Perl 5.21.4 for NetWare"
+MODULE_DESC     = "Perl 5.21.5 for NetWare"
 CCTYPE          = CodeWarrior
 C_COMPILER		= mwccnlm -c
 CPP_COMPILER	= mwccnlm
@@ -462,7 +462,7 @@ INST_NW_TOP2 = $(INST_NW_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-INST_VER	= \5.21.4
+INST_VER	= \5.21.5
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/NetWare/config_H.wc b/NetWare/config_H.wc
index 40c0a47b22..dab47bd2af 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1042,7 +1042,7 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "c:\\perl\\5.21.4\\lib\\NetWare-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.21.5\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1073,8 +1073,8 @@
  *	This symbol is the filename expanded version of the BIN symbol, for
  *	programs that do not want to deal with that at run-time.
  */
-#define BIN "c:\\perl\\5.21.4\\bin\\NetWare-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.21.4\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.21.5\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.21.5\\bin\\NetWare-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -3051,7 +3051,7 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "c:\\perl\\site\\5.21.4\\lib\\NetWare-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.21.5\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3074,7 +3074,7 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "c:\\perl\\site\\5.21.4\\lib"		/**/
+#define SITELIB "c:\\perl\\site\\5.21.5\\lib"		/**/
 /*#define SITELIB_EXP ""	/**/
 #define SITELIB_STEM ""		/**/
 
diff --git a/Porting/config.sh b/Porting/config.sh
index cda4fc575e..cb851684ae 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -39,12 +39,12 @@ alignbytes='4'
 ansi2knr=''
 aphostname='/bin/hostname'
 api_revision='5'
-api_subversion='4'
+api_subversion='5'
 api_version='21'
-api_versionstring='5.21.4'
+api_versionstring='5.21.5'
 ar='ar'
-archlib='/pro/lib/perl5/5.21.4/i686-linux-64int'
-archlibexp='/pro/lib/perl5/5.21.4/i686-linux-64int'
+archlib='/pro/lib/perl5/5.21.5/i686-linux-64int'
+archlibexp='/pro/lib/perl5/5.21.5/i686-linux-64int'
 archname64='64int'
 archname='i686-linux-64int'
 archobjs=''
@@ -766,7 +766,7 @@ incpath=''
 incpth='/usr/lib/gcc/i586-suse-linux/4.8/include /usr/local/include /usr/lib/gcc/i586-suse-linux/4.8/include-fixed /usr/lib/gcc/i586-suse-linux/4.8/../../../../i586-suse-linux/include /usr/include'
 inews=''
 initialinstalllocation='/pro/bin'
-installarchlib='/pro/lib/perl5/5.21.4/i686-linux-64int'
+installarchlib='/pro/lib/perl5/5.21.5/i686-linux-64int'
 installbin='/pro/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -774,13 +774,13 @@ installman1dir='/pro/local/man/man1'
 installman3dir='/pro/local/man/man3'
 installprefix='/pro'
 installprefixexp='/pro'
-installprivlib='/pro/lib/perl5/5.21.4'
+installprivlib='/pro/lib/perl5/5.21.5'
 installscript='/pro/bin'
-installsitearch='/pro/lib/perl5/site_perl/5.21.4/i686-linux-64int'
+installsitearch='/pro/lib/perl5/site_perl/5.21.5/i686-linux-64int'
 installsitebin='/pro/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='/pro/lib/perl5/site_perl/5.21.4'
+installsitelib='/pro/lib/perl5/site_perl/5.21.5'
 installsiteman1dir='/pro/local/man/man1'
 installsiteman3dir='/pro/local/man/man3'
 installsitescript='/pro/bin'
@@ -902,7 +902,7 @@ perl_patchlevel=''
 perl_static_inline='static __inline__'
 perladmin='hmbrand@cpan.org'
 perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
-perlpath='/pro/bin/perl5.21.4'
+perlpath='/pro/bin/perl5.21.5'
 pg='pg'
 phostname='hostname'
 pidtype='pid_t'
@@ -911,8 +911,8 @@ pmake=''
 pr=''
 prefix='/pro'
 prefixexp='/pro'
-privlib='/pro/lib/perl5/5.21.4'
-privlibexp='/pro/lib/perl5/5.21.4'
+privlib='/pro/lib/perl5/5.21.5'
+privlibexp='/pro/lib/perl5/5.21.5'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -978,17 +978,17 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 6, 17, 29, 31, 0'
 sig_size='69'
 signal_t='void'
-sitearch='/pro/lib/perl5/site_perl/5.21.4/i686-linux-64int'
-sitearchexp='/pro/lib/perl5/site_perl/5.21.4/i686-linux-64int'
+sitearch='/pro/lib/perl5/site_perl/5.21.5/i686-linux-64int'
+sitearchexp='/pro/lib/perl5/site_perl/5.21.5/i686-linux-64int'
 sitebin='/pro/bin'
 sitebinexp='/pro/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/pro/lib/perl5/site_perl/5.21.4'
+sitelib='/pro/lib/perl5/site_perl/5.21.5'
 sitelib_stem='/pro/lib/perl5/site_perl'
-sitelibexp='/pro/lib/perl5/site_perl/5.21.4'
+sitelibexp='/pro/lib/perl5/site_perl/5.21.5'
 siteman1dir='/pro/local/man/man1'
 siteman1direxp='/pro/local/man/man1'
 siteman3dir='/pro/local/man/man3'
@@ -1014,7 +1014,7 @@ src='.'
 ssizetype='ssize_t'
 st_ino_sign='1'
 st_ino_size='8'
-startperl='#!/pro/bin/perl5.21.4'
+startperl='#!/pro/bin/perl5.21.5'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
@@ -1027,7 +1027,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='4'
+subversion='5'
 sysman='/usr/share/man/man1'
 sysroot=''
 tail=''
@@ -1126,8 +1126,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.21.4'
-version_patchlevel_string='version 21 subversion 4'
+version='5.21.5'
+version_patchlevel_string='version 21 subversion 5'
 versiononly='define'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1137,10 +1137,10 @@ zcat=''
 zip='zip'
 PERL_REVISION=5
 PERL_VERSION=21
-PERL_SUBVERSION=4
+PERL_SUBVERSION=5
 PERL_API_REVISION=5
 PERL_API_VERSION=21
-PERL_API_SUBVERSION=4
+PERL_API_SUBVERSION=5
 PERL_PATCHLEVEL=''
 PERL_CONFIG_SH=true
 : Variables propagated from previous config.sh file.
diff --git a/Porting/config_H b/Porting/config_H
index 40e802c422..ddeabbca35 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -960,8 +960,8 @@
  *	This symbol contains the ~name expanded version of ARCHLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define ARCHLIB "/pro/lib/perl5/5.21.4/i686-linux-64int-ld"		/**/
-#define ARCHLIB_EXP "/pro/lib/perl5/5.21.4/i686-linux-64int-ld"		/**/
+#define ARCHLIB "/pro/lib/perl5/5.21.5/i686-linux-64int-ld"		/**/
+#define ARCHLIB_EXP "/pro/lib/perl5/5.21.5/i686-linux-64int-ld"		/**/
 
 /* ARCHNAME:
  *	This symbol holds a string representing the architecture name.
@@ -2068,8 +2068,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/pro/lib/perl5/5.21.4"		/**/
-#define PRIVLIB_EXP "/pro/lib/perl5/5.21.4"		/**/
+#define PRIVLIB "/pro/lib/perl5/5.21.5"		/**/
+#define PRIVLIB_EXP "/pro/lib/perl5/5.21.5"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -2119,8 +2119,8 @@
  *	This symbol contains the ~name expanded version of SITEARCH, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define SITEARCH "/pro/lib/perl5/site_perl/5.21.4/i686-linux-64int-ld"		/**/
-#define SITEARCH_EXP "/pro/lib/perl5/site_perl/5.21.4/i686-linux-64int-ld"		/**/
+#define SITEARCH "/pro/lib/perl5/site_perl/5.21.5/i686-linux-64int-ld"		/**/
+#define SITEARCH_EXP "/pro/lib/perl5/site_perl/5.21.5/i686-linux-64int-ld"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -2142,8 +2142,8 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "/pro/lib/perl5/site_perl/5.21.4"		/**/
-#define SITELIB_EXP "/pro/lib/perl5/site_perl/5.21.4"		/**/
+#define SITELIB "/pro/lib/perl5/site_perl/5.21.5"		/**/
+#define SITELIB_EXP "/pro/lib/perl5/site_perl/5.21.5"		/**/
 #define SITELIB_STEM "/pro/lib/perl5/site_perl"		/**/
 
 /* SSize_t:
@@ -4326,7 +4326,7 @@
  *	script to make sure (one hopes) that it runs with perl and not
  *	some shell.
  */
-#define STARTPERL "#!/pro/bin/perl5.21.4"		/**/
+#define STARTPERL "#!/pro/bin/perl5.21.5"		/**/
 
 /* HAS_STDIO_STREAM_ARRAY:
  *	This symbol, if defined, tells that there is an array
diff --git a/Porting/perldelta_template.pod b/Porting/perldelta_template.pod
index d904a50c67..fd51a10586 100644
--- a/Porting/perldelta_template.pod
+++ b/Porting/perldelta_template.pod
@@ -378,7 +378,7 @@ here.
 
 XXX Generate this with:
 
-  perl Porting/acknowledgements.pl v5.21.4..HEAD
+  perl Porting/acknowledgements.pl v5.21.5..HEAD
 
 =head1 Reporting Bugs
 
diff --git a/Porting/todo.pod b/Porting/todo.pod
index 4fba9380e5..1d053f8a9c 100644
--- a/Porting/todo.pod
+++ b/Porting/todo.pod
@@ -467,7 +467,7 @@ Natively 64-bit systems need neither -Duse64bitint nor -Duse64bitall.
 On these systems, it might be the default compilation mode, and there
 is currently no guarantee that passing no use64bitall option to the
 Configure process will build a 32bit perl. Implementing -Duse32bit*
-options would be nice for perl 5.21.4.
+options would be nice for perl 5.21.5.
 
 =head2 Profile Perl - am I hot or not?
 
@@ -1169,7 +1169,7 @@ L<http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2013-01/msg00339.html>
 =head1 Big projects
 
 Tasks that will get your name mentioned in the description of the "Highlights
-of 5.21.4"
+of 5.21.5"
 
 =head2 make ithreads more robust
 
diff --git a/README.haiku b/README.haiku
index fade672d67..a6f15ca68d 100644
--- a/README.haiku
+++ b/README.haiku
@@ -22,9 +22,9 @@ The build procedure is completely standard:
 Make perl executable and create a symlink for libperl:
 
   chmod a+x /boot/common/bin/perl
-  cd /boot/common/lib; ln -s perl5/5.21.4/BePC-haiku/CORE/libperl.so .
+  cd /boot/common/lib; ln -s perl5/5.21.5/BePC-haiku/CORE/libperl.so .
 
-Replace C<5.21.4> with your respective version of Perl.
+Replace C<5.21.5> with your respective version of Perl.
 
 =head1 KNOWN PROBLEMS
 
diff --git a/README.macosx b/README.macosx
index 1a5d811235..4579007e42 100644
--- a/README.macosx
+++ b/README.macosx
@@ -10,9 +10,9 @@ perlmacosx - Perl under Mac OS X
 
 This document briefly describes Perl under Mac OS X.
 
-  curl -O http://www.cpan.org/src/perl-5.21.4.tar.gz
-  tar -xzf perl-5.21.4.tar.gz
-  cd perl-5.21.4
+  curl -O http://www.cpan.org/src/perl-5.21.5.tar.gz
+  tar -xzf perl-5.21.5.tar.gz
+  cd perl-5.21.5
   ./Configure -des -Dprefix=/usr/local/
   make
   make test
@@ -20,7 +20,7 @@ This document briefly describes Perl under Mac OS X.
 
 =head1 DESCRIPTION
 
-The latest Perl release (5.21.4 as of this writing) builds without changes
+The latest Perl release (5.21.5 as of this writing) builds without changes
 under all versions of Mac OS X from 10.3 "Panther" onwards. 
 
 In order to build your own version of Perl you will need 'make',
diff --git a/README.os2 b/README.os2
index ae03a56dcf..d2c1f7ab5d 100644
--- a/README.os2
+++ b/README.os2
@@ -619,7 +619,7 @@ C<set PERLLIB_PREFIX> in F<Config.sys>, see L<"PERLLIB_PREFIX">.
 
 =item Additional Perl modules
 
-  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.21.4/
+  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.21.5/
 
 Same remark as above applies.  Additionally, if this directory is not
 one of directories on @INC (and @INC is influenced by C<PERLLIB_PREFIX>), you
diff --git a/README.vms b/README.vms
index 894d02c939..7f6c06b0c7 100644
--- a/README.vms
+++ b/README.vms
@@ -142,11 +142,11 @@ You may need to set up a foreign symbol for the unpacking utility of
 choice.  Once you have done so, use a command like the following to
 unpack the archive:
 
-    vmstar -xvf perl-5^.21^.4.tar
+    vmstar -xvf perl-5^.21^.5.tar
 
 Then set default to the top-level source directory like so:
 
-    set default [.perl-5^.21^.4]
+    set default [.perl-5^.21^.5]
 
 and proceed with configuration as described in the next section.
 
diff --git a/hints/catamount.sh b/hints/catamount.sh
index ac118ddd88..d4fa7d6117 100644
--- a/hints/catamount.sh
+++ b/hints/catamount.sh
@@ -31,11 +31,11 @@
 # mkdir -p /opt/perl-catamount
 # mkdir -p /opt/perl-catamount/include
 # mkdir -p /opt/perl-catamount/lib
-# mkdir -p /opt/perl-catamount/lib/perl5/5.21.4
+# mkdir -p /opt/perl-catamount/lib/perl5/5.21.5
 # mkdir -p /opt/perl-catamount/bin
 # cp *.h /opt/perl-catamount/include
 # cp libperl.a /opt/perl-catamount/lib
-# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.21.4
+# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.21.5
 # cp miniperl perl run.sh cc.sh /opt/perl-catamount/lib
 #
 # With the headers and the libperl.a you can embed Perl to your Catamount
diff --git a/intrpvar.h b/intrpvar.h
index 362d0cb3d3..ee1d3ed523 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -174,7 +174,7 @@ PERLVAR(I, statgv,	GV *)
 PERLVARI(I, statname,	SV *,	NULL)
 
 #ifdef HAS_TIMES
-/* Will be removed soon after v5.21.4. See RT #121351 */
+/* Will be removed soon after v5.21.5. See RT #121351 */
 PERLVAR(I, timesbuf,	struct tms)
 #endif
 
@@ -739,7 +739,7 @@ PERLVAR(I, debug_pad,	struct perl_debug_pad)	/* always needed because of the re
 /* Hook for File::Glob */
 PERLVARI(I, globhook,	globhook_t, NULL)
 
-/* The last unconditional member of the interpreter structure when 5.21.4 was
+/* The last unconditional member of the interpreter structure when 5.21.5 was
    released. The offset of the end of this is baked into a global variable in 
    any shared perl library which will allow a sanity test in future perl
    releases.  */
diff --git a/patchlevel.h b/patchlevel.h
index 21de76ca85..04680a52e3 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -15,7 +15,7 @@
 
 #define PERL_REVISION	5		/* age */
 #define PERL_VERSION	21		/* epoch */
-#define PERL_SUBVERSION	4		/* generation */
+#define PERL_SUBVERSION	5		/* generation */
 
 /* The following numbers describe the earliest compatible version of
    Perl ("compatibility" here being defined as sufficient binary/API
@@ -36,7 +36,7 @@
 */
 #define PERL_API_REVISION	5
 #define PERL_API_VERSION	21
-#define PERL_API_SUBVERSION	4
+#define PERL_API_SUBVERSION	5
 /*
    XXX Note:  The selection of non-default Configure options, such
    as -Duselonglong may invalidate these settings.  Currently, Configure
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index 2549388427..7e01a7fb8e 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -3373,8 +3373,8 @@
  *	This symbol contains the ~name expanded version of PRIVLIB, to be used
  *	in programs that are not prepared to deal with ~ expansion at run-time.
  */
-#define PRIVLIB "/sys/lib/perl/5.21.4"		/**/
-#define PRIVLIB_EXP "/sys/lib/perl/5.21.4"		/**/
+#define PRIVLIB "/sys/lib/perl/5.21.5"		/**/
+#define PRIVLIB_EXP "/sys/lib/perl/5.21.5"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3501,9 +3501,9 @@
  *	removed.  The elements in inc_version_list (inc_version_list.U) can
  *	be tacked onto this variable to generate a list of directories to search.
  */
-#define SITELIB "/sys/lib/perl/5.21.4/site_perl"		/**/
-#define SITELIB_EXP "/sys/lib/perl/5.21.4/site_perl"		/**/
-#define SITELIB_STEM "/sys/lib/perl/5.21.4/site_perl"		/**/
+#define SITELIB "/sys/lib/perl/5.21.5/site_perl"		/**/
+#define SITELIB_EXP "/sys/lib/perl/5.21.5/site_perl"		/**/
+#define SITELIB_STEM "/sys/lib/perl/5.21.5/site_perl"		/**/
 
 /* Size_t_size:
  *	This symbol holds the size of a Size_t in bytes.
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index 67cc84f8d9..8b32a82391 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -32,12 +32,12 @@ alignbytes='4'
 ansi2knr=''
 aphostname='/bin/uname -n'
 api_revision='5'
-api_subversion='4'
+api_subversion='5'
 api_version='21'
-api_versionstring='5.21.4'
+api_versionstring='5.21.5'
 ar='ar'
-archlib='/sys/lib/perl5/5.21.4/386'
-archlibexp='/sys/lib/perl5/5.21.4/386'
+archlib='/sys/lib/perl5/5.21.5/386'
+archlibexp='/sys/lib/perl5/5.21.5/386'
 archname64=''
 archname='386'
 archobjs=''
@@ -743,17 +743,17 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/sys/lib/perl/5.21.4/386'
+installarchlib='/sys/lib/perl/5.21.5/386'
 installbin='/usr/bin'
 installman1dir='/sys/man/1pub'
 installman3dir='/sys/man/2pub'
 installprefix='/usr'
 installprefixexp='/usr'
-installprivlib='/sys/lib/perl/5.21.4'
+installprivlib='/sys/lib/perl/5.21.5'
 installscript='/usr/bin'
-installsitearch='/sys/lib/perl/5.21.4/site_perl/386'
+installsitearch='/sys/lib/perl/5.21.5/site_perl/386'
 installsitebin='/usr/bin'
-installsitelib='/sys/lib/perl/5.21.4/site_perl'
+installsitelib='/sys/lib/perl/5.21.5/site_perl'
 installstyle='lib/perl5'
 installusrbinperl='undef'
 installvendorarch=''
@@ -874,8 +874,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/sys/lib/perl/5.21.4'
-privlibexp='/sys/lib/perl/5.21.4'
+privlib='/sys/lib/perl/5.21.5'
+privlibexp='/sys/lib/perl/5.21.5'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -940,13 +940,13 @@ sig_num='0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
 sig_num_init='0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 0'
 sig_size='50'
 signal_t='void'
-sitearch='/sys/lib/perl/5.21.4/site_perl/386'
+sitearch='/sys/lib/perl/5.21.5/site_perl/386'
 sitearchexp='/sys/lib/perl/site_perl/386'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
-sitelib='/sys/lib/perl/5.21.4/site_perl'
-sitelib_stem='/sys/lib/perl/5.21.4/site_perl'
-sitelibexp='/sys/lib/perl/5.21.4/site_perl'
+sitelib='/sys/lib/perl/5.21.5/site_perl'
+sitelib_stem='/sys/lib/perl/5.21.5/site_perl'
+sitelibexp='/sys/lib/perl/5.21.5/site_perl'
 siteprefix='/usr'
 siteprefixexp='/usr'
 sizesize='4'
@@ -979,7 +979,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/sys/include/ape/string.h'
 submit=''
-subversion='4'
+subversion='5'
 sysman='/sys/man/1pub'
 tail=''
 tar=''
@@ -1061,8 +1061,8 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.21.4'
-version_patchlevel_string='version 21 subversion 4'
+version='5.21.5'
+version_patchlevel_string='version 21 subversion 5'
 versiononly='undef'
 vi=''
 xlibpth=''
@@ -1076,9 +1076,9 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=21
-PERL_SUBVERSION=4
+PERL_SUBVERSION=5
 PERL_API_REVISION=5
 PERL_API_VERSION=21
-PERL_API_SUBVERSION=4
+PERL_API_SUBVERSION=5
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/win32/Makefile b/win32/Makefile
index a7c251fdb6..211554a965 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -37,7 +37,7 @@ INST_TOP	= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER	= \5.21.4
+#INST_VER	= \5.21.5
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/win32/makefile.mk b/win32/makefile.mk
index b15fd96a9a..4ea76c88b8 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -43,7 +43,7 @@ INST_TOP	*= $(INST_DRV)\perl
 # versioned installation can be obtained by setting INST_TOP above to a
 # path that includes an arbitrary version string.
 #
-#INST_VER	*= \5.21.4
+#INST_VER	*= \5.21.5
 
 #
 # Comment this out if you DON'T want your perl installation to have