Bump the perl version in various places for 5.31.0

29 files changed, 188 insertions, 186 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 3f2ee2f804..654922b8f0 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -32,11 +32,11 @@ alignbytes='4'
 aphostname='/bin/hostname'
 api_revision='5'
 api_subversion='0'
-api_version='30'
-api_versionstring='5.30.0'
+api_version='31'
+api_versionstring='5.31.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.30.0/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.30.0/armv4l-linux'
+archlib='/usr/lib/perl5/5.31.0/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.31.0/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.30.0/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.31.0/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'
@@ -821,7 +821,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.30.0/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.31.0/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -829,13 +829,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.30.0'
+installprivlib='./install_me_here/usr/lib/perl5/5.31.0'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.30.0/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.31.0/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.30.0'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.31.0'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -969,8 +969,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.30.0'
-privlibexp='/usr/lib/perl5/5.30.0'
+privlib='/usr/lib/perl5/5.31.0'
+privlibexp='/usr/lib/perl5/5.31.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -1035,17 +1035,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.30.0/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.30.0/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.31.0/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.31.0/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.30.0'
+sitelib='/usr/lib/perl5/site_perl/5.31.0'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.30.0'
+sitelibexp='/usr/lib/perl5/site_perl/5.31.0'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1175,8 +1175,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.30.0'
-version_patchlevel_string='version 30 subversion 0'
+version='5.31.0'
+version_patchlevel_string='version 31 subversion 0'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1189,10 +1189,10 @@ config_arg0='Configure'
 config_args=''
 config_argc=0
 PERL_REVISION=5
-PERL_VERSION=30
+PERL_VERSION=31
 PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=30
+PERL_API_VERSION=31
 PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/Cross/config.sh-arm-linux-n770 b/Cross/config.sh-arm-linux-n770
index ef5eea3e40..36ed0c11bc 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -32,11 +32,11 @@ alignbytes='4'
 aphostname='/bin/hostname'
 api_revision='5'
 api_subversion='0'
-api_version='30'
-api_versionstring='5.30.0'
+api_version='31'
+api_versionstring='5.31.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.30.0/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.30.0/armv4l-linux'
+archlib='/usr/lib/perl5/5.31.0/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.31.0/armv4l-linux'
 archname64=''
 archname='armv4l-linux'
 archobjs=''
@@ -54,7 +54,7 @@ castflags='0'
 cat='cat'
 cc='arm-none-linux-gnueabi-gcc'
 cccdlflags='-fpic'
-ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.30.0/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.31.0/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'
@@ -819,7 +819,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.30.0/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.31.0/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -827,13 +827,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.30.0'
+installprivlib='./install_me_here/usr/lib/perl5/5.31.0'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.30.0/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.31.0/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.30.0'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.31.0'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -967,8 +967,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.30.0'
-privlibexp='/usr/lib/perl5/5.30.0'
+privlib='/usr/lib/perl5/5.31.0'
+privlibexp='/usr/lib/perl5/5.31.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -1033,17 +1033,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.30.0/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.30.0/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.31.0/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.31.0/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.30.0'
+sitelib='/usr/lib/perl5/site_perl/5.31.0'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.30.0'
+sitelibexp='/usr/lib/perl5/site_perl/5.31.0'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1173,8 +1173,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.30.0'
-version_patchlevel_string='version 30 subversion 0'
+version='5.31.0'
+version_patchlevel_string='version 31 subversion 0'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1187,10 +1187,10 @@ config_arg0='Configure'
 config_args=''
 config_argc=0
 PERL_REVISION=5
-PERL_VERSION=30
+PERL_VERSION=31
 PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=30
+PERL_API_VERSION=31
 PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/INSTALL b/INSTALL
index 45c182ba59..3c394195d5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -609,7 +609,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.30.0.
+By default, Configure will use the following directories for 5.31.0.
 $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
@@ -2440,7 +2440,7 @@ http://www.chiark.greenend.org.uk/~sgtatham/bugs.html
 
 =head1 Coexistence with earlier versions of perl 5
 
-Perl 5.30.0 is not binary compatible with earlier versions of Perl.
+Perl 5.31.0 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
@@ -2515,9 +2515,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.30.0
+	sh Configure -Dprefix=/opt/perl5.31.0
 
-and adding /opt/perl5.30.0/bin to the shell PATH variable.  Such users
+and adding /opt/perl5.31.0/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.
 
@@ -2532,11 +2532,11 @@ yet.
 
 =head2 Upgrading from 5.28.0 or earlier
 
-B<Perl 5.30.0 may not be binary compatible with Perl 5.28.0 or
+B<Perl 5.31.0 may not be binary compatible with Perl 5.28.0 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.30.0.  If you find you do need to rebuild an extension with
-5.30.0, you may safely do so without disturbing the older
+used with 5.31.0.  If you find you do need to rebuild an extension with
+5.31.0, you may safely do so without disturbing the older
 installations.  (See L<"Coexistence with earlier versions of perl 5">
 above.)
 
@@ -2569,15 +2569,15 @@ Firstly, the bare minimum to run this script
      print("$f\n");
   }
 
-in Linux with perl-5.30.0 is as follows (under $Config{prefix}):
+in Linux with perl-5.31.0 is as follows (under $Config{prefix}):
 
   ./bin/perl
-  ./lib/perl5/5.30.0/strict.pm
-  ./lib/perl5/5.30.0/warnings.pm
-  ./lib/perl5/5.30.0/i686-linux/File/Glob.pm
-  ./lib/perl5/5.30.0/feature.pm
-  ./lib/perl5/5.30.0/XSLoader.pm
-  ./lib/perl5/5.30.0/i686-linux/auto/File/Glob/Glob.so
+  ./lib/perl5/5.31.0/strict.pm
+  ./lib/perl5/5.31.0/warnings.pm
+  ./lib/perl5/5.31.0/i686-linux/File/Glob.pm
+  ./lib/perl5/5.31.0/feature.pm
+  ./lib/perl5/5.31.0/XSLoader.pm
+  ./lib/perl5/5.31.0/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
diff --git a/META.json b/META.json
index ca02de12be..17cc415266 100644
--- a/META.json
+++ b/META.json
@@ -114,7 +114,7 @@
          "vxs.inc"
       ]
    },
-   "release_status" : "stable",
+   "release_status" : "unstable",
    "resources" : {
       "bugtracker" : {
          "web" : "https://rt.perl.org/"
@@ -127,6 +127,6 @@
          "url" : "http://perl5.git.perl.org/"
       }
    },
-   "version" : "5.030000",
+   "version" : "5.031000",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }
diff --git a/META.yml b/META.yml
index dddcbb0dc6..9def25c817 100644
--- a/META.yml
+++ b/META.yml
@@ -114,5 +114,5 @@ resources:
   homepage: http://www.perl.org/
   license: http://dev.perl.org/licenses/
   repository: http://perl5.git.perl.org/
-version: '5.030000'
+version: '5.031000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/NetWare/Makefile b/NetWare/Makefile
index d670a1f829..d6130e241f 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.30.0 for NetWare"
+MODULE_DESC     = "Perl 5.31.0 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.30.0
+INST_VER	= \5.31.0
 
 #
 # 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 53544224d1..53b374c9b2 100644
--- a/NetWare/config_H.wc
+++ b/NetWare/config_H.wc
@@ -887,7 +887,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.30.0\\lib\\NetWare-x86-multi-thread"		/**/
+#define ARCHLIB "c:\\perl\\5.31.0\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define ARCHLIB_EXP ""	/**/
 
 /* ARCHNAME:
@@ -918,8 +918,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.30.0\\bin\\NetWare-x86-multi-thread"	/**/
-#define BIN_EXP "c:\\perl\\5.30.0\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN "c:\\perl\\5.31.0\\bin\\NetWare-x86-multi-thread"	/**/
+#define BIN_EXP "c:\\perl\\5.31.0\\bin\\NetWare-x86-multi-thread"	/**/
 
 /* BYTEORDER:
  *	This symbol holds the hexadecimal constant defined in byteorder,
@@ -2878,7 +2878,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.30.0\\lib\\NetWare-x86-multi-thread"		/**/
+#define SITEARCH "c:\\perl\\site\\5.31.0\\lib\\NetWare-x86-multi-thread"		/**/
 /*#define SITEARCH_EXP ""	/**/
 
 /* SITELIB:
@@ -2901,7 +2901,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.30.0\\lib"		/**/
+#define SITELIB "c:\\perl\\site\\5.31.0\\lib"		/**/
 /*#define SITELIB_EXP ""	/**/
 #define SITELIB_STEM ""		/**/
 
diff --git a/Porting/config.sh b/Porting/config.sh
index eefc0d7db1..3c6d1ac619 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -45,11 +45,11 @@ alignbytes='8'
 aphostname=''
 api_revision='5'
 api_subversion='0'
-api_version='30'
-api_versionstring='5.30.0'
+api_version='31'
+api_versionstring='5.31.0'
 ar='ar'
-archlib='/opt/perl/lib/5.30.0/x86_64-linux'
-archlibexp='/opt/perl/lib/5.30.0/x86_64-linux'
+archlib='/opt/perl/lib/5.31.0/x86_64-linux'
+archlibexp='/opt/perl/lib/5.31.0/x86_64-linux'
 archname64=''
 archname='x86_64-linux'
 archobjs=''
@@ -845,7 +845,7 @@ incpath=''
 incpth='/usr/lib/gcc/x86_64-linux-gnu/4.9/include /usr/local/include /usr/lib/gcc/x86_64-linux-gnu/4.9/include-fixed /usr/include/x86_64-linux-gnu /usr/include'
 inews=''
 initialinstalllocation='/opt/perl/bin'
-installarchlib='/opt/perl/lib/5.30.0/x86_64-linux'
+installarchlib='/opt/perl/lib/5.31.0/x86_64-linux'
 installbin='/opt/perl/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -853,13 +853,13 @@ installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.30.0'
+installprivlib='/opt/perl/lib/5.31.0'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.30.0/x86_64-linux'
+installsitearch='/opt/perl/lib/site_perl/5.31.0/x86_64-linux'
 installsitebin='/opt/perl/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='/opt/perl/lib/site_perl/5.30.0'
+installsitelib='/opt/perl/lib/site_perl/5.31.0'
 installsiteman1dir='/opt/perl/man/man1'
 installsiteman3dir='/opt/perl/man/man3'
 installsitescript='/opt/perl/bin'
@@ -984,7 +984,7 @@ perl_patchlevel=''
 perl_static_inline='static __inline__'
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc'
-perlpath='/opt/perl/bin/perl5.30.0'
+perlpath='/opt/perl/bin/perl5.31.0'
 pg='pg'
 phostname=''
 pidtype='pid_t'
@@ -993,8 +993,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.30.0'
-privlibexp='/opt/perl/lib/5.30.0'
+privlib='/opt/perl/lib/5.31.0'
+privlibexp='/opt/perl/lib/5.31.0'
 procselfexe='"/proc/self/exe"'
 ptrsize='8'
 quadkind='2'
@@ -1059,17 +1059,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.30.0/x86_64-linux'
-sitearchexp='/opt/perl/lib/site_perl/5.30.0/x86_64-linux'
+sitearch='/opt/perl/lib/site_perl/5.31.0/x86_64-linux'
+sitearchexp='/opt/perl/lib/site_perl/5.31.0/x86_64-linux'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/opt/perl/lib/site_perl/5.30.0'
+sitelib='/opt/perl/lib/site_perl/5.31.0'
 sitelib_stem='/opt/perl/lib/site_perl'
-sitelibexp='/opt/perl/lib/site_perl/5.30.0'
+sitelibexp='/opt/perl/lib/site_perl/5.31.0'
 siteman1dir='/opt/perl/man/man1'
 siteman1direxp='/opt/perl/man/man1'
 siteman3dir='/opt/perl/man/man3'
@@ -1095,7 +1095,7 @@ src='.'
 ssizetype='ssize_t'
 st_ino_sign='1'
 st_ino_size='8'
-startperl='#!/opt/perl/bin/perl5.30.0'
+startperl='#!/opt/perl/bin/perl5.31.0'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
@@ -1205,8 +1205,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.30.0'
-version_patchlevel_string='version 30 subversion 0'
+version='5.31.0'
+version_patchlevel_string='version 31 subversion 0'
 versiononly='define'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1215,10 +1215,10 @@ yaccflags=''
 zcat=''
 zip='zip'
 PERL_REVISION=5
-PERL_VERSION=30
+PERL_VERSION=31
 PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=30
+PERL_API_VERSION=31
 PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=''
 PERL_CONFIG_SH=true
diff --git a/Porting/config_H b/Porting/config_H
index 7d4081dd50..8194ca2723 100644
--- a/Porting/config_H
+++ b/Porting/config_H
@@ -1239,8 +1239,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 "/opt/perl/lib/5.30.0/x86_64-linux"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.30.0/x86_64-linux"		/**/
+#define ARCHLIB "/opt/perl/lib/5.31.0/x86_64-linux"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.31.0/x86_64-linux"		/**/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -1293,8 +1293,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 "/opt/perl/lib/5.30.0"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.30.0"		/**/
+#define PRIVLIB "/opt/perl/lib/5.31.0"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.31.0"		/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1311,8 +1311,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 "/opt/perl/lib/site_perl/5.30.0/x86_64-linux"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.30.0/x86_64-linux"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.31.0/x86_64-linux"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.31.0/x86_64-linux"		/**/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -1334,8 +1334,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 "/opt/perl/lib/site_perl/5.30.0"		/**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl/5.30.0"		/**/
+#define SITELIB "/opt/perl/lib/site_perl/5.31.0"		/**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.31.0"		/**/
 #define SITELIB_STEM "/opt/perl/lib/site_perl"		/**/
 
 /* PERL_VENDORARCH:
@@ -4109,7 +4109,7 @@
  *	script to make sure (one hopes) that it runs with perl and not
  *	some shell.
  */
-#define STARTPERL "#!/opt/perl/bin/perl5.30.0"		/**/
+#define STARTPERL "#!/opt/perl/bin/perl5.31.0"		/**/
 
 /* 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 90f45f2d81..dcb8e06038 100644
--- a/Porting/perldelta_template.pod
+++ b/Porting/perldelta_template.pod
@@ -403,7 +403,7 @@ died, add a short obituary here.
 
 XXX Generate this with:
 
-  perl Porting/acknowledgements.pl v5.30.0..HEAD
+  perl Porting/acknowledgements.pl v5.31.0..HEAD
 
 =head1 Reporting Bugs
 
diff --git a/README.haiku b/README.haiku
index 1b185d9cd5..fb6c7cca79 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.30.0/BePC-haiku/CORE/libperl.so .
+  cd /boot/common/lib; ln -s perl5/5.31.0/BePC-haiku/CORE/libperl.so .
 
-Replace C<5.30.0> with your respective version of Perl.
+Replace C<5.31.0> with your respective version of Perl.
 
 =head1 KNOWN PROBLEMS
 
diff --git a/README.macosx b/README.macosx
index ac721d58d5..42dd320cb4 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.30.0.tar.gz
-  tar -xzf perl-5.30.0.tar.gz
-  cd perl-5.30.0
+  curl -O http://www.cpan.org/src/perl-5.31.0.tar.gz
+  tar -xzf perl-5.31.0.tar.gz
+  cd perl-5.31.0
   ./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.30.0 as of this writing) builds without changes
+The latest Perl release (5.31.0 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 3b497100e3..2daaaec66c 100644
--- a/README.os2
+++ b/README.os2
@@ -619,7 +619,7 @@ C<set PERLLIB_PREFIX> in F<Config.sys>, see L</"C<PERLLIB_PREFIX>">.
 
 =item Additional Perl modules
 
-  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.30.0/
+  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.31.0/
 
 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 14f46bc2aa..cb746c60df 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^.30^.0.tar
+    vmstar -xvf perl-5^.31^.0.tar
 
 Then set default to the top-level source directory like so:
 
-    set default [.perl-5^.30^.0]
+    set default [.perl-5^.31^.0]
 
 and proceed with configuration as described in the next section.
 
diff --git a/README.win32 b/README.win32
index 2d2c16cac3..9e87709866 100644
--- a/README.win32
+++ b/README.win32
@@ -405,7 +405,7 @@ Be sure to read the instructions near the top of the makefiles carefully.
 Type "dmake" ("gmake" for GNU make, or "nmake" if you are using that make).
 
 This should build everything.  Specifically, it will create perl.exe,
-perl530.dll at the perl toplevel, and various other extension dll's
+perl531.dll at the perl toplevel, and various other extension dll's
 under the lib\auto directory.  If the build fails for any reason, make
 sure you have done the previous steps correctly.
 
diff --git a/hints/catamount.sh b/hints/catamount.sh
index 7d70c81b10..c316d07fb0 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.30.0
+# mkdir -p /opt/perl-catamount/lib/perl5/5.31.0
 # 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.30.0
+# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.31.0
 # 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/lib/B/Op_private.pm b/lib/B/Op_private.pm
index 7bf2ce50bd..c8c1b1549d 100644
--- a/lib/B/Op_private.pm
+++ b/lib/B/Op_private.pm
@@ -118,7 +118,7 @@ package B::Op_private;
 our %bits;
 
 
-our $VERSION = "5.030000";
+our $VERSION = "5.031000";
 
 $bits{$_}{3} = 'OPpENTERSUB_AMPER' for qw(entersub rv2cv);
 $bits{$_}{6} = 'OPpENTERSUB_DB' for qw(entersub rv2cv);
diff --git a/lib/feature.pm b/lib/feature.pm
index b83ebff3cb..5965d361a9 100644
--- a/lib/feature.pm
+++ b/lib/feature.pm
@@ -5,7 +5,7 @@
 
 package feature;
 
-our $VERSION = '1.54';
+our $VERSION = '1.55';
 
 our %feature = (
     fc              => 'feature_fc',
diff --git a/patchlevel.h b/patchlevel.h
index acafc2be3c..9b3e98ca8c 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -14,7 +14,7 @@
  * exactly on the third column */
 
 #define PERL_REVISION	5		/* age */
-#define PERL_VERSION	30		/* epoch */
+#define PERL_VERSION	31		/* epoch */
 #define PERL_SUBVERSION	0		/* generation */
 
 /* The following numbers describe the earliest compatible version of
@@ -35,7 +35,7 @@
    changing them should not be necessary.
 */
 #define PERL_API_REVISION	5
-#define PERL_API_VERSION	30
+#define PERL_API_VERSION	31
 #define PERL_API_SUBVERSION	0
 /*
    XXX Note:  The selection of non-default Configure options, such
diff --git a/plan9/config.plan9 b/plan9/config.plan9
index 2989a6f87f..e576998d62 100644
--- a/plan9/config.plan9
+++ b/plan9/config.plan9
@@ -3131,8 +3131,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.30.0"		/**/
-#define PRIVLIB_EXP "/sys/lib/perl/5.30.0"		/**/
+#define PRIVLIB "/sys/lib/perl/5.31.0"		/**/
+#define PRIVLIB_EXP "/sys/lib/perl/5.31.0"		/**/
 
 /* PTRSIZE:
  *	This symbol contains the size of a pointer, so that the C preprocessor
@@ -3259,9 +3259,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.30.0/site_perl"		/**/
-#define SITELIB_EXP "/sys/lib/perl/5.30.0/site_perl"		/**/
-#define SITELIB_STEM "/sys/lib/perl/5.30.0/site_perl"		/**/
+#define SITELIB "/sys/lib/perl/5.31.0/site_perl"		/**/
+#define SITELIB_EXP "/sys/lib/perl/5.31.0/site_perl"		/**/
+#define SITELIB_STEM "/sys/lib/perl/5.31.0/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 7fd1476d19..e9650fbfeb 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -32,11 +32,11 @@ alignbytes='4'
 aphostname='/bin/uname -n'
 api_revision='5'
 api_subversion='0'
-api_version='30'
-api_versionstring='5.30.0'
+api_version='31'
+api_versionstring='5.31.0'
 ar='ar'
-archlib='/sys/lib/perl5/5.30.0/386'
-archlibexp='/sys/lib/perl5/5.30.0/386'
+archlib='/sys/lib/perl5/5.31.0/386'
+archlibexp='/sys/lib/perl5/5.31.0/386'
 archname64=''
 archname='386'
 archobjs=''
@@ -815,17 +815,17 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/sys/lib/perl/5.30.0/386'
+installarchlib='/sys/lib/perl/5.31.0/386'
 installbin='/usr/bin'
 installman1dir='/sys/man/1pub'
 installman3dir='/sys/man/2pub'
 installprefix='/usr'
 installprefixexp='/usr'
-installprivlib='/sys/lib/perl/5.30.0'
+installprivlib='/sys/lib/perl/5.31.0'
 installscript='/usr/bin'
-installsitearch='/sys/lib/perl/5.30.0/site_perl/386'
+installsitearch='/sys/lib/perl/5.31.0/site_perl/386'
 installsitebin='/usr/bin'
-installsitelib='/sys/lib/perl/5.30.0/site_perl'
+installsitelib='/sys/lib/perl/5.31.0/site_perl'
 installstyle='lib/perl5'
 installusrbinperl='undef'
 installvendorarch=''
@@ -950,8 +950,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/sys/lib/perl/5.30.0'
-privlibexp='/sys/lib/perl/5.30.0'
+privlib='/sys/lib/perl/5.31.0'
+privlibexp='/sys/lib/perl/5.31.0'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -1016,13 +1016,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.30.0/site_perl/386'
+sitearch='/sys/lib/perl/5.31.0/site_perl/386'
 sitearchexp='/sys/lib/perl/site_perl/386'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
-sitelib='/sys/lib/perl/5.30.0/site_perl'
-sitelib_stem='/sys/lib/perl/5.30.0/site_perl'
-sitelibexp='/sys/lib/perl/5.30.0/site_perl'
+sitelib='/sys/lib/perl/5.31.0/site_perl'
+sitelib_stem='/sys/lib/perl/5.31.0/site_perl'
+sitelibexp='/sys/lib/perl/5.31.0/site_perl'
 siteprefix='/usr'
 siteprefixexp='/usr'
 sizesize='4'
@@ -1136,8 +1136,8 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.30.0'
-version_patchlevel_string='version 30 subversion 0'
+version='5.31.0'
+version_patchlevel_string='version 31 subversion 0'
 versiononly='undef'
 vi=''
 xlibpth=''
@@ -1150,10 +1150,10 @@ config_arg0='./Configure'
 config_args=''
 config_argc=0
 PERL_REVISION=5
-PERL_VERSION=30
+PERL_VERSION=31
 PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=30
+PERL_API_VERSION=31
 PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/regen/feature.pl b/regen/feature.pl
index 12bf5a8068..db713ae7b3 100755
--- a/regen/feature.pl
+++ b/regen/feature.pl
@@ -65,6 +65,8 @@ my %feature_bundle = (
 		    evalbytes current_sub fc postderef_qq bitwise)],
     "5.29"   =>	[qw(say state switch unicode_strings unicode_eval
 		    evalbytes current_sub fc postderef_qq bitwise)],
+    "5.31"   =>	[qw(say state switch unicode_strings unicode_eval
+		    evalbytes current_sub fc postderef_qq bitwise)],
 );
 
 my @noops = qw( postderef lexical_subs );
@@ -380,7 +382,7 @@ read_only_bottom_close_and_rename($h);
 __END__
 package feature;
 
-our $VERSION = '1.54';
+our $VERSION = '1.55';
 
 FEATURES
 
diff --git a/uconfig.h b/uconfig.h
index 9341deef18..3b7ccf9e62 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -1229,8 +1229,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 "/usr/local/lib/perl5/5.30/unknown"		/ **/
-/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.30/unknown"		/ **/
+/*#define ARCHLIB "/usr/local/lib/perl5/5.31/unknown"		/ **/
+/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.31/unknown"		/ **/
 
 /* BIN:
  *	This symbol holds the path of the bin directory where the package will
@@ -1283,8 +1283,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 "/usr/local/lib/perl5/5.30"		/**/
-#define PRIVLIB_EXP "/usr/local/lib/perl5/5.30"		/**/
+#define PRIVLIB "/usr/local/lib/perl5/5.31"		/**/
+#define PRIVLIB_EXP "/usr/local/lib/perl5/5.31"		/**/
 
 /* SITEARCH:
  *	This symbol contains the name of the private library for this package.
@@ -1301,8 +1301,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 "/usr/local/lib/perl5/5.30/unknown"		/ **/
-/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.30/unknown"		/ **/
+/*#define SITEARCH "/usr/local/lib/perl5/5.31/unknown"		/ **/
+/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.31/unknown"		/ **/
 
 /* SITELIB:
  *	This symbol contains the name of the private library for this package.
@@ -1324,8 +1324,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 "/usr/local/lib/perl5/5.30"		/**/
-#define SITELIB_EXP "/usr/local/lib/perl5/5.30"		/**/
+#define SITELIB "/usr/local/lib/perl5/5.31"		/**/
+#define SITELIB_EXP "/usr/local/lib/perl5/5.31"		/**/
 #define SITELIB_STEM "/usr/local/lib/perl5"		/**/
 
 /* PERL_VENDORARCH:
@@ -5245,5 +5245,5 @@
 
 /* Generated from:
  * 6608de918c3c876975f74b684da2536ab1ee23459783d691ae02ce2526a497a7 config_h.SH
- * 2aaf18b9277e180fc5e5d60290ecb0c91fcac3531bd8825e5687a212daa586e9 uconfig.sh
+ * a11d95f56af200907b9285ed0da243a4c20db34f5684af313d18195eaba2b18b uconfig.sh
  * ex: set ro: */
diff --git a/uconfig.sh b/uconfig.sh
index 560a766e75..fca0e4dacd 100644
--- a/uconfig.sh
+++ b/uconfig.sh
@@ -6,8 +6,8 @@ afs='false'
 afsroot='/afs'
 alignbytes='4'
 aphostname='/bin/hostname'
-archlib='/usr/local/lib/perl5/5.30/unknown'
-archlibexp='/usr/local/lib/perl5/5.30/unknown'
+archlib='/usr/local/lib/perl5/5.31/unknown'
+archlibexp='/usr/local/lib/perl5/5.31/unknown'
 archname='unknown'
 asctime_r_proto='0'
 bin='/usr/local/bin'
@@ -778,8 +778,8 @@ package='perl5'
 perl_static_inline='static'
 phostname='hostname'
 pidtype=int
-privlib='/usr/local/lib/perl5/5.30'
-privlibexp='/usr/local/lib/perl5/5.30'
+privlib='/usr/local/lib/perl5/5.31'
+privlibexp='/usr/local/lib/perl5/5.31'
 procselfexe=''
 prototype='undef'
 ptrsize='4'
@@ -829,11 +829,11 @@ sig_name_init='0'
 sig_num_init='0'
 sig_size='1'
 signal_t=int
-sitearch='/usr/local/lib/perl5/5.30/unknown'
-sitearchexp='/usr/local/lib/perl5/5.30/unknown'
-sitelib='/usr/local/lib/perl5/5.30'
+sitearch='/usr/local/lib/perl5/5.31/unknown'
+sitearchexp='/usr/local/lib/perl5/5.31/unknown'
+sitelib='/usr/local/lib/perl5/5.31'
 sitelib_stem='/usr/local/lib/perl5'
-sitelibexp='/usr/local/lib/perl5/5.30'
+sitelibexp='/usr/local/lib/perl5/5.31'
 sizesize=4
 sizetype='size_t'
 socksizetype='int'
diff --git a/uconfig64.sh b/uconfig64.sh
index bab459fdbf..a6b9901acd 100644
--- a/uconfig64.sh
+++ b/uconfig64.sh
@@ -6,8 +6,8 @@ afs='false'
 afsroot='/afs'
 alignbytes='8'
 aphostname='/bin/hostname'
-archlib='/usr/local/lib/perl5/5.30/unknown'
-archlibexp='/usr/local/lib/perl5/5.30/unknown'
+archlib='/usr/local/lib/perl5/5.31/unknown'
+archlibexp='/usr/local/lib/perl5/5.31/unknown'
 archname='unknown64'
 asctime_r_proto='0'
 bin='/usr/local/bin'
@@ -778,8 +778,8 @@ package='perl5'
 perl_static_inline='static'
 phostname='hostname'
 pidtype=int
-privlib='/usr/local/lib/perl5/5.30'
-privlibexp='/usr/local/lib/perl5/5.30'
+privlib='/usr/local/lib/perl5/5.31'
+privlibexp='/usr/local/lib/perl5/5.31'
 procselfexe=''
 prototype='undef'
 ptrsize='8'
@@ -829,11 +829,11 @@ sig_name_init='0'
 sig_num_init='0'
 sig_size='1'
 signal_t=int
-sitearch='/usr/local/lib/perl5/5.30/unknown'
-sitearchexp='/usr/local/lib/perl5/5.30/unknown'
-sitelib='/usr/local/lib/perl5/5.30'
+sitearch='/usr/local/lib/perl5/5.31/unknown'
+sitearchexp='/usr/local/lib/perl5/5.31/unknown'
+sitelib='/usr/local/lib/perl5/5.31'
 sitelib_stem='/usr/local/lib/perl5'
-sitelibexp='/usr/local/lib/perl5/5.30'
+sitelibexp='/usr/local/lib/perl5/5.31'
 sizesize=4
 sizetype='size_t'
 socksizetype='int'
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 8376467acd..a11b28f67d 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -7,7 +7,7 @@
 #	Windows SDK 64-bit compiler and tools
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl530.dll).  Also makes individual DLLs for the XS extensions.
+# (perl531.dll).  Also makes individual DLLs for the XS extensions.
 #
 # The easiest way to customize the build process is to use parameters like this:
 #
@@ -64,7 +64,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.30.0
+#INST_VER	:= \5.31.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -233,7 +233,7 @@ DEFAULT_INC_EXCLUDES_DOT := define
 # set this to additionally provide a statically linked perl-static.exe.
 # Note that dynamic loading will not work with this perl, so you must
 # include required modules statically using the STATIC_EXT or ALL_STATIC
-# variables below. A static library perl530s.lib will also be created.
+# variables below. A static library perl531s.lib will also be created.
 # Ordinary perl.exe is not affected by this option.
 #
 #BUILD_STATIC	:= define
@@ -1020,9 +1020,9 @@ ifeq ($(CCTYPE),GCC)
 
 CFGSH_TMPL	= config.gc
 CFGH_TMPL	= config_H.gc
-PERLIMPLIB	= $(COREDIR)\libperl530$(a)
-PERLIMPLIBBASE	= libperl530$(a)
-PERLSTATICLIB	= ..\libperl530s$(a)
+PERLIMPLIB	= $(COREDIR)\libperl531$(a)
+PERLIMPLIBBASE	= libperl531$(a)
+PERLSTATICLIB	= ..\libperl531s$(a)
 INT64		= long long
 
 else
@@ -1035,12 +1035,12 @@ endif
 
 # makedef.pl must be updated if this changes, and this should normally
 # only change when there is an incompatible revision of the public API.
-PERLIMPLIB	?= $(COREDIR)\perl530$(a)
-PERLIMPLIBBASE	?= perl530$(a)
-PERLEXPLIB	?= $(COREDIR)\perl530.exp
-PERLSTATICLIB	?= ..\perl530s$(a)
-PERLDLL		= ..\perl530.dll
-PERLDLLBASE	= perl530.dll
+PERLIMPLIB	?= $(COREDIR)\perl531$(a)
+PERLIMPLIBBASE	?= perl531$(a)
+PERLEXPLIB	?= $(COREDIR)\perl531.exp
+PERLSTATICLIB	?= ..\perl531s$(a)
+PERLDLL		= ..\perl531.dll
+PERLDLLBASE	= perl531.dll
 
 # don't let "gmake -n all" try to run "miniperl.exe make_ext.pl"
 PLMAKE		= gmake
diff --git a/win32/Makefile b/win32/Makefile
index f1c7d1f61b..b66ec6f5a8 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -5,7 +5,7 @@
 #	Windows SDK 64-bit compiler and tools
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl530.dll).  Also makes individual DLLs for the XS extensions.
+# (perl531.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -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.30.0
+#INST_VER	= \5.31.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -194,7 +194,7 @@ DEFAULT_INC_EXCLUDES_DOT = define
 # set this to additionally provide a statically linked perl-static.exe.
 # Note that dynamic loading will not work with this perl, so you must
 # include required modules statically using the STATIC_EXT or ALL_STATIC
-# variables below. A static library perl530s.lib will also be created.
+# variables below. A static library perl531s.lib will also be created.
 # Ordinary perl.exe is not affected by this option.
 #
 #BUILD_STATIC	= define
@@ -683,9 +683,9 @@ $(o).dll:
 
 # makedef.pl must be updated if this changes, and this should normally
 # only change when there is an incompatible revision of the public API.
-PERLIMPLIB	= ..\perl530.lib
-PERLSTATICLIB	= ..\perl530s.lib
-PERLDLL		= ..\perl530.dll
+PERLIMPLIB	= ..\perl531.lib
+PERLSTATICLIB	= ..\perl531s.lib
+PERLDLL		= ..\perl531.dll
 
 MINIPERL	= ..\miniperl.exe
 MINIDIR		= .\mini
diff --git a/win32/Makefile.ce b/win32/Makefile.ce
index dde7a7fc45..d518c1063d 100644
--- a/win32/Makefile.ce
+++ b/win32/Makefile.ce
@@ -5,7 +5,7 @@
 #
 
 SRCDIR     = ..
-PV         = 530
+PV         = 531
 
 # 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 0494bb509c..df350f8dda 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -7,7 +7,7 @@
 #	Windows SDK 64-bit compiler and tools
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl530.dll).  Also makes individual DLLs for the XS extensions.
+# (perl531.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -45,7 +45,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.30.0
+#INST_VER	*= \5.31.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -223,7 +223,7 @@ DEFAULT_INC_EXCLUDES_DOT *= define
 # set this to additionally provide a statically linked perl-static.exe.
 # Note that dynamic loading will not work with this perl, so you must
 # include required modules statically using the STATIC_EXT or ALL_STATIC
-# variables below. A static library perl530s.lib will also be created.
+# variables below. A static library perl531s.lib will also be created.
 # Ordinary perl.exe is not affected by this option.
 #
 #BUILD_STATIC	*= define
@@ -964,8 +964,8 @@ UTILS		=			\
 
 CFGSH_TMPL	= config.gc
 CFGH_TMPL	= config_H.gc
-PERLIMPLIB	= $(COREDIR)\libperl530$(a)
-PERLSTATICLIB	= ..\libperl530s$(a)
+PERLIMPLIB	= $(COREDIR)\libperl531$(a)
+PERLSTATICLIB	= ..\libperl531s$(a)
 INT64		= long long
 
 .ELSE
@@ -978,11 +978,11 @@ INT64		= __int64
 
 # makedef.pl must be updated if this changes, and this should normally
 # only change when there is an incompatible revision of the public API.
-PERLIMPLIB	*= $(COREDIR)\perl530$(a)
-PERLEXPLIB	*= $(COREDIR)\perl530.exp
-PERLSTATICLIB	*= ..\perl530s$(a)
-PERLDLL		= ..\perl530.dll
-PERLDLLBASE	= perl530.dll
+PERLIMPLIB	*= $(COREDIR)\perl531$(a)
+PERLEXPLIB	*= $(COREDIR)\perl531.exp
+PERLSTATICLIB	*= ..\perl531s$(a)
+PERLDLL		= ..\perl531.dll
+PERLDLLBASE	= perl531.dll
 
 #EUMM on Win32 isn't ready for parallel make, so only allow this file to be parallel
 #$(MAKE) will contain the -P that this makefile was called with, which is bad for