bump version to 5.18.4

22 files changed, 123 insertions, 123 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 1384fcd082..6138a978f0 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='18'
 api_versionstring='5.18.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.18.3/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.18.3/armv4l-linux'
+archlib='/usr/lib/perl5/5.18.4/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.18.4/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.18.3/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.18.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'
@@ -732,7 +732,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.18.3/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.18.4/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -740,13 +740,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.18.3'
+installprivlib='./install_me_here/usr/lib/perl5/5.18.4'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.18.3/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.18.4/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.18.3'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.18.4'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -875,8 +875,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.18.3'
-privlibexp='/usr/lib/perl5/5.18.3'
+privlib='/usr/lib/perl5/5.18.4'
+privlibexp='/usr/lib/perl5/5.18.4'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -941,17 +941,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.18.3/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.18.3/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.18.4/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.4/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.18.3'
+sitelib='/usr/lib/perl5/site_perl/5.18.4'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.18.3'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.4'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -990,7 +990,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=''
@@ -1080,8 +1080,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.18.3'
-version_patchlevel_string='version 18 subversion 3'
+version='5.18.4'
+version_patchlevel_string='version 18 subversion 4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1096,7 +1096,7 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=18
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=18
 PERL_API_SUBVERSION=0
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index 3534734e76..2c27acaac3 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='18'
 api_versionstring='5.18.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.18.3/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.18.3/armv4l-linux'
+archlib='/usr/lib/perl5/5.18.4/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.18.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.18.3/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.18.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.18.3/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.18.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.18.3'
+installprivlib='./install_me_here/usr/lib/perl5/5.18.4'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.18.3/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.18.4/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.18.3'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.18.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.18.3'
-privlibexp='/usr/lib/perl5/5.18.3'
+privlib='/usr/lib/perl5/5.18.4'
+privlibexp='/usr/lib/perl5/5.18.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.18.3/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.18.3/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.18.4/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.18.4/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.18.3'
+sitelib='/usr/lib/perl5/site_perl/5.18.4'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.18.3'
+sitelibexp='/usr/lib/perl5/site_perl/5.18.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.18.3'
-version_patchlevel_string='version 18 subversion 3'
+version='5.18.4'
+version_patchlevel_string='version 18 subversion 4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1056,7 +1056,7 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=18
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=18
 PERL_API_SUBVERSION=0
diff --git a/INSTALL b/INSTALL
index 919f07e9d1..c4cb2c2515 100644
--- a/INSTALL
+++ b/INSTALL
@@ -563,7 +563,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.18.3.
+By default, Configure will use the following directories for 5.18.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
@@ -2346,7 +2346,7 @@ http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 
 =head1 Coexistence with earlier versions of perl 5
 
-Perl 5.18.3 is not binary compatible with earlier versions of Perl.
+Perl 5.18.4 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.
@@ -2420,9 +2420,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.18.3
+	sh Configure -Dprefix=/opt/perl5.18.4
 
-and adding /opt/perl5.18.3/bin to the shell PATH variable.  Such users
+and adding /opt/perl5.18.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.
 
@@ -2437,11 +2437,11 @@ yet.
 
 =head2 Upgrading from 5.17.11 or earlier
 
-B<Perl 5.18.3 may not be binary compatible with Perl 5.17.11 or
+B<Perl 5.18.4 may not be binary compatible with Perl 5.17.11 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.18.3.  If you find you do need to rebuild an extension with
-5.18.3, you may safely do so without disturbing the older
+used with 5.18.4.  If you find you do need to rebuild an extension with
+5.18.4, you may safely do so without disturbing the older
 installations.  (See L<"Coexistence with earlier versions of perl 5">
 above.)
 
@@ -2474,15 +2474,15 @@ Firstly, the bare minimum to run this script
      print("$f\n");
   }
 
-in Linux with perl-5.18.3 is as follows (under $Config{prefix}):
+in Linux with perl-5.18.4 is as follows (under $Config{prefix}):
 
   ./bin/perl
-  ./lib/perl5/5.18.3/strict.pm
-  ./lib/perl5/5.18.3/warnings.pm
-  ./lib/perl5/5.18.3/i686-linux/File/Glob.pm
-  ./lib/perl5/5.18.3/feature.pm
-  ./lib/perl5/5.18.3/XSLoader.pm
-  ./lib/perl5/5.18.3/i686-linux/auto/File/Glob/Glob.so
+  ./lib/perl5/5.18.4/strict.pm
+  ./lib/perl5/5.18.4/warnings.pm
+  ./lib/perl5/5.18.4/i686-linux/File/Glob.pm
+  ./lib/perl5/5.18.4/feature.pm
+  ./lib/perl5/5.18.4/XSLoader.pm
+  ./lib/perl5/5.18.4/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 200e32497a..44f375e353 100644
--- a/META.json
+++ b/META.json
@@ -131,5 +131,5 @@
          "url" : "http://perl5.git.perl.org/"
       }
    },
-   "version" : "5.018003"
+   "version" : "5.018004"
 }
diff --git a/META.yml b/META.yml
index 08c14f0a66..e51f728832 100644
--- a/META.yml
+++ b/META.yml
@@ -118,4 +118,4 @@ resources:
   homepage: http://www.perl.org/
   license: http://dev.perl.org/licenses/
   repository: http://perl5.git.perl.org/
-version: 5.018003
+version: 5.018004
diff --git a/NetWare/Makefile b/NetWare/Makefile
index 1aae341436..096f73cda8 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.18.3 for NetWare"
+MODULE_DESC     = "Perl 5.18.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.18.3
+INST_VER	= \5.18.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 49956b7db7..3add21b2ba 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.18.3\\lib\\NetWare-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.18.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.18.3\\bin\\NetWare-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.18.3\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.18.4\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.18.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.18.3\\lib\\NetWare-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.18.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.18.3\\lib"		/**/
+#define SITELIB "c:\\perl\\site\\5.18.4\\lib"		/**/
 /*#define SITELIB_EXP ""	/**/
 #define SITELIB_STEM ""		/**/
 
diff --git a/Porting/config.sh b/Porting/config.sh
index a9a208b7fc..b2dcb0c25d 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -49,8 +49,8 @@ api_subversion='0'
 api_version='18'
 api_versionstring='5.18.0'
 ar='ar'
-archlib='/opt/perl/lib/5.18.3/i686-linux-64int'
-archlibexp='/opt/perl/lib/5.18.3/i686-linux-64int'
+archlib='/opt/perl/lib/5.18.4/i686-linux-64int'
+archlibexp='/opt/perl/lib/5.18.4/i686-linux-64int'
 archname64='64int'
 archname='i686-linux-64int'
 archobjs=''
@@ -750,7 +750,7 @@ inc_version_list_init='0'
 incpath=''
 inews=''
 initialinstalllocation='/opt/perl/bin'
-installarchlib='/opt/perl/lib/5.18.3/i686-linux-64int'
+installarchlib='/opt/perl/lib/5.18.4/i686-linux-64int'
 installbin='/opt/perl/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -758,13 +758,13 @@ installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.18.3'
+installprivlib='/opt/perl/lib/5.18.4'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.18.3/i686-linux-64int'
+installsitearch='/opt/perl/lib/site_perl/5.18.4/i686-linux-64int'
 installsitebin='/opt/perl/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='/opt/perl/lib/site_perl/5.18.3'
+installsitelib='/opt/perl/lib/site_perl/5.18.4'
 installsiteman1dir='/opt/perl/man/man1'
 installsiteman3dir='/opt/perl/man/man3'
 installsitescript='/opt/perl/bin'
@@ -887,7 +887,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.18.3'
+perlpath='/opt/perl/bin/perl5.18.4'
 pg='pg'
 phostname=''
 pidtype='pid_t'
@@ -896,8 +896,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.18.3'
-privlibexp='/opt/perl/lib/5.18.3'
+privlib='/opt/perl/lib/5.18.4'
+privlibexp='/opt/perl/lib/5.18.4'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -963,17 +963,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.18.3/i686-linux-64int'
-sitearchexp='/opt/perl/lib/site_perl/5.18.3/i686-linux-64int'
+sitearch='/opt/perl/lib/site_perl/5.18.4/i686-linux-64int'
+sitearchexp='/opt/perl/lib/site_perl/5.18.4/i686-linux-64int'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/opt/perl/lib/site_perl/5.18.3'
+sitelib='/opt/perl/lib/site_perl/5.18.4'
 sitelib_stem='/opt/perl/lib/site_perl'
-sitelibexp='/opt/perl/lib/site_perl/5.18.3'
+sitelibexp='/opt/perl/lib/site_perl/5.18.4'
 siteman1dir='/opt/perl/man/man1'
 siteman1direxp='/opt/perl/man/man1'
 siteman3dir='/opt/perl/man/man3'
@@ -999,7 +999,7 @@ src='.'
 ssizetype='ssize_t'
 st_ino_sign='1'
 st_ino_size='4'
-startperl='#!/opt/perl/bin/perl5.18.3'
+startperl='#!/opt/perl/bin/perl5.18.4'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
@@ -1012,7 +1012,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=''
@@ -1102,8 +1102,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.18.3'
-version_patchlevel_string='version 18 subversion 3'
+version='5.18.4'
+version_patchlevel_string='version 18 subversion 4'
 versiononly='define'
 vi=''
 voidflags='15'
@@ -1127,7 +1127,7 @@ config_arg8='-Dusedevel'
 config_arg9='-dE'
 PERL_REVISION=5
 PERL_VERSION=18
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=18
 PERL_API_SUBVERSION=0
diff --git a/Porting/config_H b/Porting/config_H
index d60d1f92e9..9240a0b5aa 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.18.3/i686-linux-64int-ld"		/**/
-#define ARCHLIB_EXP "/pro/lib/perl5/5.18.3/i686-linux-64int-ld"		/**/
+#define ARCHLIB "/pro/lib/perl5/5.18.4/i686-linux-64int-ld"		/**/
+#define ARCHLIB_EXP "/pro/lib/perl5/5.18.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.18.3"		/**/
-#define PRIVLIB_EXP "/pro/lib/perl5/5.18.3"		/**/
+#define PRIVLIB "/pro/lib/perl5/5.18.4"		/**/
+#define PRIVLIB_EXP "/pro/lib/perl5/5.18.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.18.3/i686-linux-64int-ld"		/**/
-#define SITEARCH_EXP "/pro/lib/perl5/site_perl/5.18.3/i686-linux-64int-ld"		/**/
+#define SITEARCH "/pro/lib/perl5/site_perl/5.18.4/i686-linux-64int-ld"		/**/
+#define SITEARCH_EXP "/pro/lib/perl5/site_perl/5.18.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.18.3"		/**/
-#define SITELIB_EXP "/pro/lib/perl5/site_perl/5.18.3"		/**/
+#define SITELIB "/pro/lib/perl5/site_perl/5.18.4"		/**/
+#define SITELIB_EXP "/pro/lib/perl5/site_perl/5.18.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.18.3"		/**/
+#define STARTPERL "#!/pro/bin/perl5.18.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 7666379cfd..ccf48f1e7d 100644
--- a/Porting/perldelta_template.pod
+++ b/Porting/perldelta_template.pod
@@ -368,7 +368,7 @@ here.
 
 XXX Generate this with:
 
-  perl Porting/acknowledgements.pl v5.18.3..HEAD
+  perl Porting/acknowledgements.pl v5.18.4..HEAD
 
 =head1 Reporting Bugs
 
diff --git a/Porting/todo.pod b/Porting/todo.pod
index 7ae1e96739..ff02c7a9f3 100644
--- a/Porting/todo.pod
+++ b/Porting/todo.pod
@@ -466,7 +466,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.18.3.
+options would be nice for perl 5.18.4.
 
 =head2 Profile Perl - am I hot or not?
 
@@ -1173,7 +1173,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.18.3"
+of 5.18.4"
 
 =head2 make ithreads more robust
 
diff --git a/README.haiku b/README.haiku
index 5a7ee1ba26..d28a6c26ab 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.18.3/BePC-haiku/CORE/libperl.so .
+  cd /boot/common/lib; ln -s perl5/5.18.4/BePC-haiku/CORE/libperl.so .
 
-Replace C<5.18.3> with your respective version of Perl.
+Replace C<5.18.4> with your respective version of Perl.
 
 =head1 KNOWN PROBLEMS
 
diff --git a/README.macosx b/README.macosx
index a8245b645c..31d998caa8 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 http://www.cpan.org/src/perl-5.18.3.tar.gz > perl-5.18.0.tar.gz
-  tar -xzf perl-5.18.3.tar.gz
-  cd perl-5.18.3
+  curl http://www.cpan.org/src/perl-5.18.4.tar.gz > perl-5.18.0.tar.gz
+  tar -xzf perl-5.18.4.tar.gz
+  cd perl-5.18.4
   ./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.18.3 as of this writing) builds without changes
+The latest Perl release (5.18.4 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 328039feaf..7998785548 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.18.3/
+  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.18.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 3b6f1cc85d..830cb9c420 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^.18^.3.tar
+    vmstar -xvf perl-5^.18^.4.tar
 
 Then set default to the top-level source directory like so:
 
-    set default [.perl-5^.18^.3]
+    set default [.perl-5^.18^.4]
 
 and proceed with configuration as described in the next section.
 
diff --git a/hints/catamount.sh b/hints/catamount.sh
index f79b1f78f2..1fb06d0b29 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.18.3
+# mkdir -p /opt/perl-catamount/lib/perl5/5.18.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.18.3
+# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.18.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/intrpvar.h b/intrpvar.h
index cf9a00d8d0..d465e151fc 100644
--- a/intrpvar.h
+++ b/intrpvar.h
@@ -741,7 +741,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.18.3 was
+/* The last unconditional member of the interpreter structure when 5.18.4 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 c46e430e45..cb033ea265 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -15,7 +15,7 @@
 
 #define PERL_REVISION	5		/* age */
 #define PERL_VERSION	18		/* 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
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index dc013c8e88..ef73254c6c 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.18.3"		/**/
-#define PRIVLIB_EXP "/sys/lib/perl/5.18.3"		/**/
+#define PRIVLIB "/sys/lib/perl/5.18.4"		/**/
+#define PRIVLIB_EXP "/sys/lib/perl/5.18.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.18.3/site_perl"		/**/
-#define SITELIB_EXP "/sys/lib/perl/5.18.3/site_perl"		/**/
-#define SITELIB_STEM "/sys/lib/perl/5.18.3/site_perl"		/**/
+#define SITELIB "/sys/lib/perl/5.18.4/site_perl"		/**/
+#define SITELIB_EXP "/sys/lib/perl/5.18.4/site_perl"		/**/
+#define SITELIB_STEM "/sys/lib/perl/5.18.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 0b9ab40120..660dc906ea 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -36,8 +36,8 @@ api_subversion='0'
 api_version='18'
 api_versionstring='5.18.0'
 ar='ar'
-archlib='/sys/lib/perl5/5.18.3/386'
-archlibexp='/sys/lib/perl5/5.18.3/386'
+archlib='/sys/lib/perl5/5.18.4/386'
+archlibexp='/sys/lib/perl5/5.18.4/386'
 archname64=''
 archname='386'
 archobjs=''
@@ -726,17 +726,17 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/sys/lib/perl/5.18.3/386'
+installarchlib='/sys/lib/perl/5.18.4/386'
 installbin='/usr/bin'
 installman1dir='/sys/man/1pub'
 installman3dir='/sys/man/2pub'
 installprefix='/usr'
 installprefixexp='/usr'
-installprivlib='/sys/lib/perl/5.18.3'
+installprivlib='/sys/lib/perl/5.18.4'
 installscript='/usr/bin'
-installsitearch='/sys/lib/perl/5.18.3/site_perl/386'
+installsitearch='/sys/lib/perl/5.18.4/site_perl/386'
 installsitebin='/usr/bin'
-installsitelib='/sys/lib/perl/5.18.3/site_perl'
+installsitelib='/sys/lib/perl/5.18.4/site_perl'
 installstyle='lib/perl5'
 installusrbinperl='undef'
 installvendorarch=''
@@ -856,8 +856,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/sys/lib/perl/5.18.3'
-privlibexp='/sys/lib/perl/5.18.3'
+privlib='/sys/lib/perl/5.18.4'
+privlibexp='/sys/lib/perl/5.18.4'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -922,13 +922,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.18.3/site_perl/386'
+sitearch='/sys/lib/perl/5.18.4/site_perl/386'
 sitearchexp='/sys/lib/perl/site_perl/386'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
-sitelib='/sys/lib/perl/5.18.3/site_perl'
-sitelib_stem='/sys/lib/perl/5.18.3/site_perl'
-sitelibexp='/sys/lib/perl/5.18.3/site_perl'
+sitelib='/sys/lib/perl/5.18.4/site_perl'
+sitelib_stem='/sys/lib/perl/5.18.4/site_perl'
+sitelibexp='/sys/lib/perl/5.18.4/site_perl'
 siteprefix='/usr'
 siteprefixexp='/usr'
 sizesize='4'
@@ -961,7 +961,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=''
@@ -1041,8 +1041,8 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.18.3'
-version_patchlevel_string='version 18 subversion 3'
+version='5.18.4'
+version_patchlevel_string='version 18 subversion 4'
 versiononly='undef'
 vi=''
 voidflags='15'
@@ -1057,7 +1057,7 @@ config_args=''
 config_argc=0
 PERL_REVISION=5
 PERL_VERSION=18
-PERL_SUBVERSION=3
+PERL_SUBVERSION=4
 PERL_API_REVISION=5
 PERL_API_VERSION=18
 PERL_API_SUBVERSION=0
diff --git a/win32/Makefile b/win32/Makefile
index 0ede24bd31..ccbcd27147 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.18.3
+#INST_VER	= \5.18.4
 
 #
 # Comment this out if you DON'T want your perl installation to have
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 5f3f88f321..20366affb9 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.18.3
+#INST_VER	*= \5.18.4
 
 #
 # Comment this out if you DON'T want your perl installation to have