Bump the perl version in various places for 5.15.4

21 files changed, 140 insertions, 140 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index e611e353f4..fbdedb831f 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='3'
+api_subversion='4'
 api_version='15'
-api_versionstring='5.15.3'
+api_versionstring='5.15.4'
 ar='ar'
-archlib='/usr/lib/perl5/5.15.3/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.15.3/armv4l-linux'
+archlib='/usr/lib/perl5/5.15.4/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.15.4/armv4l-linux'
 archname64=''
 archname='armv4l-linux'
 archobjs=''
@@ -55,7 +55,7 @@ castflags='0'
 cat='cat'
 cc='cc'
 cccdlflags='-fpic'
-ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.15.3/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.15.4/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'
@@ -725,7 +725,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.15.3/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.15.4/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -733,13 +733,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.15.3'
+installprivlib='./install_me_here/usr/lib/perl5/5.15.4'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.15.3/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.15.4/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.15.3'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.15.4'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -868,8 +868,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.15.3'
-privlibexp='/usr/lib/perl5/5.15.3'
+privlib='/usr/lib/perl5/5.15.4'
+privlibexp='/usr/lib/perl5/5.15.4'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -934,17 +934,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.15.3/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.15.3/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.15.4/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.15.4/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.15.3'
+sitelib='/usr/lib/perl5/site_perl/5.15.4'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.15.3'
+sitelibexp='/usr/lib/perl5/site_perl/5.15.4'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -983,7 +983,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='3'
+subversion='4'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1073,8 +1073,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.15.3'
-version_patchlevel_string='version 15 subversion 3'
+version='5.15.4'
+version_patchlevel_string='version 15 subversion 4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1089,9 +1089,9 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=15
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=15
-PERL_API_SUBVERSION=3
+PERL_API_SUBVERSION=4
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 243318ee6f..32df9686f8 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='3'
+api_subversion='4'
 api_version='15'
-api_versionstring='5.15.3'
+api_versionstring='5.15.4'
 ar='ar'
-archlib='/usr/lib/perl5/5.15.3/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.15.3/armv4l-linux'
+archlib='/usr/lib/perl5/5.15.4/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.15.4/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.15.3/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.15.4/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'
@@ -703,7 +703,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.15.3/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.15.4/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -711,13 +711,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.15.3'
+installprivlib='./install_me_here/usr/lib/perl5/5.15.4'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.15.3/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.15.4/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.15.3'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.15.4'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -845,8 +845,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.15.3'
-privlibexp='/usr/lib/perl5/5.15.3'
+privlib='/usr/lib/perl5/5.15.4'
+privlibexp='/usr/lib/perl5/5.15.4'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -907,17 +907,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.15.3/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.15.3/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.15.4/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.15.4/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.15.3'
+sitelib='/usr/lib/perl5/site_perl/5.15.4'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.15.3'
+sitelibexp='/usr/lib/perl5/site_perl/5.15.4'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -954,7 +954,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='3'
+subversion='4'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1040,8 +1040,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.15.3'
-version_patchlevel_string='version 15 subversion 3'
+version='5.15.4'
+version_patchlevel_string='version 15 subversion 4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1056,9 +1056,9 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=15
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=15
-PERL_API_SUBVERSION=3
+PERL_API_SUBVERSION=4
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/INSTALL b/INSTALL
index 6955a180e0..2c2f89b43d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -530,7 +530,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.15.3.
+By default, Configure will use the following directories for 5.15.4.
 $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
@@ -841,7 +841,7 @@ must contain a space separated list of directories under the site_perl
 directory, and has to include architecture-dependent directories separately,
 eg.
 
-       sh Configure -Dinc_version_list="5.15.3/x86_64-linux 5.14.0" ...
+       sh Configure -Dinc_version_list="5.15.4/x86_64-linux 5.14.0" ...
 
 When using the newer perl, you can add these paths again in the
 PERL5LIB environment variable or with perl's -I runtime option.
@@ -2373,9 +2373,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.15.3
+	sh Configure -Dprefix=/opt/perl5.15.4
 
-and adding /opt/perl5.15.3/bin to the shell PATH variable.  Such users
+and adding /opt/perl5.15.4/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.
 
@@ -2388,13 +2388,13 @@ seriously consider using a separate directory, since development
 subversions may not have all the compatibility wrinkles ironed out
 yet.
 
-=head2 Upgrading from 5.15.2 or earlier
+=head2 Upgrading from 5.15.3 or earlier
 
-B<Perl 5.15.3 is binary incompatible with Perl 5.15.0 and any earlier
+B<Perl 5.15.4 is binary incompatible with Perl 5.15.3 and any earlier
 Perl release.>  Perl modules having binary parts
 (meaning that a C compiler is used) will have to be recompiled to be
-used with 5.15.3.  If you find you do need to rebuild an extension with
-5.15.3, you may safely do so without disturbing the older
+used with 5.15.4.  If you find you do need to rebuild an extension with
+5.15.4, you may safely do so without disturbing the older
 installations.  (See L<"Coexistence with earlier versions of perl 5">
 above.)
 
diff --git a/META.yml b/META.yml
index 221520b01d..66a05823a9 100644
--- a/META.yml
+++ b/META.yml
@@ -1,5 +1,5 @@
 name: perl
-version: 5.015003
+version: 5.015004
 abstract: The Perl 5 language interpreter
 author: perl5-porters@perl.org
 license: perl
diff --git a/NetWare/Makefile b/NetWare/Makefile
index 0eb11497f7..9849836309 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.15.3 for NetWare"
+MODULE_DESC     = "Perl 5.15.4 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.15.3
+INST_VER	= \5.15.4
 
 #
 # 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 8edb4ab47d..a029ddbfac 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -1048,7 +1048,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.15.3\\lib\\NetWare-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.15.4\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -1079,8 +1079,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.15.3\\bin\\NetWare-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.15.3\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.15.4\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.15.4\\bin\\NetWare-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -3063,7 +3063,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.15.3\\lib\\NetWare-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.15.4\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -3086,7 +3086,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.15.3\\lib"		/**/
+#define SITELIB "c:\\perl\\site\\5.15.4\\lib"		/**/
 /*#define SITELIB_EXP ""	/**/
 #define SITELIB_STEM ""		/**/
 
diff --git a/Porting/config.sh b/Porting/config.sh
index fce318784e..cebc7badc9 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -45,12 +45,12 @@ alignbytes='4'
 ansi2knr=''
 aphostname=''
 api_revision='5'
-api_subversion='3'
+api_subversion='4'
 api_version='15'
-api_versionstring='5.15.3'
+api_versionstring='5.15.4'
 ar='ar'
-archlib='/opt/perl/lib/5.15.3/i686-linux-64int'
-archlibexp='/opt/perl/lib/5.15.3/i686-linux-64int'
+archlib='/opt/perl/lib/5.15.4/i686-linux-64int'
+archlibexp='/opt/perl/lib/5.15.4/i686-linux-64int'
 archname64='64int'
 archname='i686-linux-64int'
 archobjs=''
@@ -743,7 +743,7 @@ inc_version_list_init='0'
 incpath=''
 inews=''
 initialinstalllocation='/opt/perl/bin'
-installarchlib='/opt/perl/lib/5.15.3/i686-linux-64int'
+installarchlib='/opt/perl/lib/5.15.4/i686-linux-64int'
 installbin='/opt/perl/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -751,13 +751,13 @@ installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.15.3'
+installprivlib='/opt/perl/lib/5.15.4'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.15.3/i686-linux-64int'
+installsitearch='/opt/perl/lib/site_perl/5.15.4/i686-linux-64int'
 installsitebin='/opt/perl/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='/opt/perl/lib/site_perl/5.15.3'
+installsitelib='/opt/perl/lib/site_perl/5.15.4'
 installsiteman1dir='/opt/perl/man/man1'
 installsiteman3dir='/opt/perl/man/man3'
 installsitescript='/opt/perl/bin'
@@ -880,7 +880,7 @@ perl_patchlevel='34948'
 perl_static_inline='static __inline__'
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc'
-perlpath='/opt/perl/bin/perl5.15.3'
+perlpath='/opt/perl/bin/perl5.15.4'
 pg='pg'
 phostname=''
 pidtype='pid_t'
@@ -889,8 +889,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.15.3'
-privlibexp='/opt/perl/lib/5.15.3'
+privlib='/opt/perl/lib/5.15.4'
+privlibexp='/opt/perl/lib/5.15.4'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -956,17 +956,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='/opt/perl/lib/site_perl/5.15.3/i686-linux-64int'
-sitearchexp='/opt/perl/lib/site_perl/5.15.3/i686-linux-64int'
+sitearch='/opt/perl/lib/site_perl/5.15.4/i686-linux-64int'
+sitearchexp='/opt/perl/lib/site_perl/5.15.4/i686-linux-64int'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/opt/perl/lib/site_perl/5.15.3'
+sitelib='/opt/perl/lib/site_perl/5.15.4'
 sitelib_stem='/opt/perl/lib/site_perl'
-sitelibexp='/opt/perl/lib/site_perl/5.15.3'
+sitelibexp='/opt/perl/lib/site_perl/5.15.4'
 siteman1dir='/opt/perl/man/man1'
 siteman1direxp='/opt/perl/man/man1'
 siteman3dir='/opt/perl/man/man3'
@@ -992,7 +992,7 @@ src='.'
 ssizetype='ssize_t'
 st_ino_sign='1'
 st_ino_size='4'
-startperl='#!/opt/perl/bin/perl5.15.3'
+startperl='#!/opt/perl/bin/perl5.15.4'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
@@ -1005,7 +1005,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='3'
+subversion='4'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1095,8 +1095,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.15.3'
-version_patchlevel_string='version 15 subversion 3'
+version='5.15.4'
+version_patchlevel_string='version 15 subversion 4'
 versiononly='define'
 vi=''
 voidflags='15'
@@ -1120,10 +1120,10 @@ config_arg8='-Dusedevel'
 config_arg9='-dE'
 PERL_REVISION=5
 PERL_VERSION=15
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=15
-PERL_API_SUBVERSION=3
+PERL_API_SUBVERSION=4
 PERL_PATCHLEVEL=34948
 PERL_CONFIG_SH=true
 : Variables propagated from previous config.sh file.
diff --git a/Porting/config_H b/Porting/config_H
index 5f4d965b41..e8338d0084 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -966,8 +966,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.15.3/i686-linux-64int-ld"		/**/
-#define ARCHLIB_EXP "/pro/lib/perl5/5.15.3/i686-linux-64int-ld"		/**/
+#define ARCHLIB "/pro/lib/perl5/5.15.4/i686-linux-64int-ld"		/**/
+#define ARCHLIB_EXP "/pro/lib/perl5/5.15.4/i686-linux-64int-ld"		/**/
 
 /* ARCHNAME:
  *	This symbol holds a string representing the architecture name.
@@ -2074,8 +2074,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.15.3"		/**/
-#define PRIVLIB_EXP "/pro/lib/perl5/5.15.3"		/**/
+#define PRIVLIB "/pro/lib/perl5/5.15.4"		/**/
+#define PRIVLIB_EXP "/pro/lib/perl5/5.15.4"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -2125,8 +2125,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.15.3/i686-linux-64int-ld"		/**/
-#define SITEARCH_EXP "/pro/lib/perl5/site_perl/5.15.3/i686-linux-64int-ld"		/**/
+#define SITEARCH "/pro/lib/perl5/site_perl/5.15.4/i686-linux-64int-ld"		/**/
+#define SITEARCH_EXP "/pro/lib/perl5/site_perl/5.15.4/i686-linux-64int-ld"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -2148,8 +2148,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.15.3"		/**/
-#define SITELIB_EXP "/pro/lib/perl5/site_perl/5.15.3"		/**/
+#define SITELIB "/pro/lib/perl5/site_perl/5.15.4"		/**/
+#define SITELIB_EXP "/pro/lib/perl5/site_perl/5.15.4"		/**/
 #define SITELIB_STEM "/pro/lib/perl5/site_perl"		/**/
 
 /* SSize_t:
@@ -4369,7 +4369,7 @@
  *	script to make sure (one hopes) that it runs with perl and not
  *	some shell.
  */
-#define STARTPERL "#!/pro/bin/perl5.15.3"		/**/
+#define STARTPERL "#!/pro/bin/perl5.15.4"		/**/
 
 /* 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 942d9694bb..84064385c8 100644
--- a/Porting/perldelta_template.pod
+++ b/Porting/perldelta_template.pod
@@ -355,7 +355,7 @@ here.
 
 XXX Generate this with:
 
-  perl Porting/acknowledgements.pl v5.15.3..HEAD
+  perl Porting/acknowledgements.pl v5.15.4..HEAD
 
 =head1 Reporting Bugs
 
diff --git a/README.haiku b/README.haiku
index 2e7d9084dd..b09b1108e1 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.15.3/BePC-haiku/CORE/libperl.so .
+  cd /boot/common/lib; ln -s perl5/5.15.4/BePC-haiku/CORE/libperl.so .
 
-Replace C<5.15.3> with your respective version of Perl.
+Replace C<5.15.4> with your respective version of Perl.
 
 =head1 KNOWN PROBLEMS
 
diff --git a/README.os2 b/README.os2
index 5cd27a24ff..d973b82748 100644
--- a/README.os2
+++ b/README.os2
@@ -618,7 +618,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.15.3/
+  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.15.4/
 
 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 26c7a57bd7..383185cfd6 100644
--- a/README.vms
+++ b/README.vms
@@ -154,12 +154,12 @@ recent versions of vmstar (e.g. V3.4 or later).  Contrary to advice
 provided with previous versions of Perl, do I<not> use the ODS-2
 compatibility qualifier.  Instead, use a command like the following:
 
-    vmstar -xvf perl-5^.15^.3.tar
+    vmstar -xvf perl-5^.15^.4.tar
 
 Then rename the top-level source directory like so:
 
-    set security/protection=(o:rwed) perl-5^.15^.3.dir
-    rename perl-5^.15^.3.dir perl-5_15_3.dir
+    set security/protection=(o:rwed) perl-5^.15^.4.dir
+    rename perl-5^.15^.4.dir perl-5_15_4.dir
 
 The reason for this last step is that while filenames with multiple dots
 are generally supported by Perl on VMS, I<directory> names with multiple
diff --git a/epoc/config.sh b/epoc/config.sh
index c80589005e..2215274c37 100644
--- a/epoc/config.sh
+++ b/epoc/config.sh
@@ -33,8 +33,8 @@ apirevision=''
 apisubversion=''
 apiversion=''
 ar='arm-epoc-pe-ar'
-archlib='/usr/lib/perl/5.15.3/epoc'
-archlibexp='/usr/lib/perl/5.15.3/epoc'
+archlib='/usr/lib/perl/5.15.4/epoc'
+archlibexp='/usr/lib/perl/5.15.4/epoc'
 archname64=''
 archname='epoc'
 archobjs='epoc.o epocish.o epoc_stubs.o'
@@ -711,16 +711,16 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/home/of/PERL/perl/lib/5.15.3/epoc'
+installarchlib='/home/of/PERL/perl/lib/5.15.4/epoc'
 installbin='/home/of/PERL/System/Programs/'
 installman1dir='/home/of/PERL/man1'
 installman3dir='/home/of/PERL/man3'
 installprefix=''
 installprefixexp=''
-installprivlib='/home/of/PERL/perl/lib/5.15.3/'
+installprivlib='/home/of/PERL/perl/lib/5.15.4/'
 installscript='/home/of/PERL/bin/'
-installsitearch='/home/of/PERL/site/lib/site_perl/5.15.3/epoc'
-installsitelib='/home/of/PERL/perl/lib/site_perl/5.15.3'
+installsitearch='/home/of/PERL/site/lib/site_perl/5.15.4/epoc'
+installsitelib='/home/of/PERL/perl/lib/site_perl/5.15.4'
 installstyle=''
 installusrbinperl='undef'
 installvendorarch=''
@@ -842,8 +842,8 @@ pmake=''
 pr=''
 prefix=''
 prefixexp=''
-privlib='/usr/lib/perl/5.15.3'
-privlibexp='/usr/lib/perl/5.15.3'
+privlib='/usr/lib/perl/5.15.4'
+privlibexp='/usr/lib/perl/5.15.4'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -906,11 +906,11 @@ sig_num='0'
 sig_num_init='0, 0'
 sig_size='1'
 signal_t='void'
-sitearch='/usr/lib/perl/site_perl/5.15.3/epoc'
-sitearchexp='/usr/lib/perl/site_perl/5.15.3/epoc'
-sitelib='/usr/lib/perl/site_perl/5.15.3/'
+sitearch='/usr/lib/perl/site_perl/5.15.4/epoc'
+sitearchexp='/usr/lib/perl/site_perl/5.15.4/epoc'
+sitelib='/usr/lib/perl/site_perl/5.15.4/'
 sitelib_stem='/usr/lib/perl/site_perl'
-sitelibexp='/usr/lib/perl/site_perl/5.15.3/'
+sitelibexp='/usr/lib/perl/site_perl/5.15.4/'
 siteprefix=''
 siteprefixexp=''
 sizesize='4'
@@ -1020,7 +1020,7 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.15.3'
+version='5.15.4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1044,10 +1044,10 @@ config_arg10=''
 config_arg11=''
 PERL_REVISION=5
 PERL_VERSION=15
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=15
-PERL_API_SUBVERSION=3
+PERL_API_SUBVERSION=4
 PERL_CONFIG_SH=true
 CONFIGDOTSH=true
 # Variables propagated from previous config.sh file.
diff --git a/epoc/createpkg.pl b/epoc/createpkg.pl
index 7b4aabf089..3f46fe507e 100644
--- a/epoc/createpkg.pl
+++ b/epoc/createpkg.pl
@@ -3,7 +3,7 @@
 use File::Find;
 use Cwd;
 
-$VERSION="5.15.3";
+$VERSION="5.15.4";
 $EPOC_VERSION=1;
 
 
diff --git a/hints/catamount.sh b/hints/catamount.sh
index 7d4159b8b1..bf189558b7 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.15.3
+# mkdir -p /opt/perl-catamount/lib/perl5/5.15.4
 # 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.15.3
+# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.15.4
 # 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/patchlevel.h b/patchlevel.h
index 5be7cd1d61..4a356b33a5 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -15,7 +15,7 @@
 
 #define PERL_REVISION	5		/* age */
 #define PERL_VERSION	15		/* epoch */
-#define PERL_SUBVERSION	3		/* generation */
+#define PERL_SUBVERSION	4		/* 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	15
-#define PERL_API_SUBVERSION	3
+#define PERL_API_SUBVERSION	4
 /*
    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 ae5683b55f..2b0b50d863 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -3385,8 +3385,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.15.3"		/**/
-#define PRIVLIB_EXP "/sys/lib/perl/5.15.3"		/**/
+#define PRIVLIB "/sys/lib/perl/5.15.4"		/**/
+#define PRIVLIB_EXP "/sys/lib/perl/5.15.4"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3513,9 +3513,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.15.3/site_perl"		/**/
-#define SITELIB_EXP "/sys/lib/perl/5.15.3/site_perl"		/**/
-#define SITELIB_STEM "/sys/lib/perl/5.15.3/site_perl"		/**/
+#define SITELIB "/sys/lib/perl/5.15.4/site_perl"		/**/
+#define SITELIB_EXP "/sys/lib/perl/5.15.4/site_perl"		/**/
+#define SITELIB_STEM "/sys/lib/perl/5.15.4/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 bd5da2fa14..7c0bbcc4c4 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='3'
+api_subversion='4'
 api_version='15'
-api_versionstring='5.15.3'
+api_versionstring='5.15.4'
 ar='ar'
-archlib='/sys/lib/perl5/5.15.3/386'
-archlibexp='/sys/lib/perl5/5.15.3/386'
+archlib='/sys/lib/perl5/5.15.4/386'
+archlibexp='/sys/lib/perl5/5.15.4/386'
 archname64=''
 archname='386'
 archobjs=''
@@ -719,17 +719,17 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/sys/lib/perl/5.15.3/386'
+installarchlib='/sys/lib/perl/5.15.4/386'
 installbin='/usr/bin'
 installman1dir='/sys/man/1pub'
 installman3dir='/sys/man/2pub'
 installprefix='/usr'
 installprefixexp='/usr'
-installprivlib='/sys/lib/perl/5.15.3'
+installprivlib='/sys/lib/perl/5.15.4'
 installscript='/usr/bin'
-installsitearch='/sys/lib/perl/5.15.3/site_perl/386'
+installsitearch='/sys/lib/perl/5.15.4/site_perl/386'
 installsitebin='/usr/bin'
-installsitelib='/sys/lib/perl/5.15.3/site_perl'
+installsitelib='/sys/lib/perl/5.15.4/site_perl'
 installstyle='lib/perl5'
 installusrbinperl='undef'
 installvendorarch=''
@@ -849,8 +849,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/sys/lib/perl/5.15.3'
-privlibexp='/sys/lib/perl/5.15.3'
+privlib='/sys/lib/perl/5.15.4'
+privlibexp='/sys/lib/perl/5.15.4'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -915,13 +915,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.15.3/site_perl/386'
+sitearch='/sys/lib/perl/5.15.4/site_perl/386'
 sitearchexp='/sys/lib/perl/site_perl/386'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
-sitelib='/sys/lib/perl/5.15.3/site_perl'
-sitelib_stem='/sys/lib/perl/5.15.3/site_perl'
-sitelibexp='/sys/lib/perl/5.15.3/site_perl'
+sitelib='/sys/lib/perl/5.15.4/site_perl'
+sitelib_stem='/sys/lib/perl/5.15.4/site_perl'
+sitelibexp='/sys/lib/perl/5.15.4/site_perl'
 siteprefix='/usr'
 siteprefixexp='/usr'
 sizesize='4'
@@ -954,7 +954,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/sys/include/ape/string.h'
 submit=''
-subversion='3'
+subversion='4'
 sysman='/sys/man/1pub'
 tail=''
 tar=''
@@ -1034,8 +1034,8 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.15.3'
-version_patchlevel_string='version 15 subversion 3'
+version='5.15.4'
+version_patchlevel_string='version 15 subversion 4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1050,9 +1050,9 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=15
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=15
-PERL_API_SUBVERSION=3
+PERL_API_SUBVERSION=4
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/win32/Makefile b/win32/Makefile
index 55def99bb5..301f131258 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.15.3
+#INST_VER	= \5.15.4
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index b219ae6f58..f50b9aa0bd 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -6,7 +6,7 @@
 
 SRCDIR     = ..
 PV         = 59
-INST_VER   = 5.15.3
+INST_VER   = 5.15.4
 
 # INSTALL_ROOT specifies a path where this perl will be installed on CE device
 INSTALL_ROOT=/netzwerk/sprache/perl
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 77e98d5afc..a689226d80 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -38,7 +38,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.15.3
+#INST_VER	*= \5.15.4
 
 #
 # Comment this out if you DON'T want your perl installation to have