bump version to v5.36.0 (RC0)

22 files changed, 179 insertions, 178 deletions

diff --git a/Cross/config.sh-arm-linux b/Cross/config.sh-arm-linux
index 7f898cc78f..f2303707b7 100644
--- a/Cross/config.sh-arm-linux
+++ b/Cross/config.sh-arm-linux
@@ -31,12 +31,12 @@ afsroot='/afs'
 alignbytes='4'
 aphostname='/bin/hostname'
 api_revision='5'
-api_subversion='12'
-api_version='35'
-api_versionstring='5.35.12'
+api_subversion='0'
+api_version='36'
+api_versionstring='5.36.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.35.12/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.35.12/armv4l-linux'
+archlib='/usr/lib/perl5/5.36.0/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.36.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.35.12/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.36.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'
@@ -831,7 +831,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.35.12/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.36.0/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -839,13 +839,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.35.12'
+installprivlib='./install_me_here/usr/lib/perl5/5.36.0'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.35.12/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.36.0/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.35.12'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.36.0'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -980,8 +980,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.35.12'
-privlibexp='/usr/lib/perl5/5.35.12'
+privlib='/usr/lib/perl5/5.36.0'
+privlibexp='/usr/lib/perl5/5.36.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -1046,17 +1046,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.35.12/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.35.12/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.36.0/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.36.0/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.35.12'
+sitelib='/usr/lib/perl5/site_perl/5.36.0'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.35.12'
+sitelibexp='/usr/lib/perl5/site_perl/5.36.0'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1097,7 +1097,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='12'
+subversion='0'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1188,8 +1188,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.35.12'
-version_patchlevel_string='version 35 subversion 12'
+version='5.36.0'
+version_patchlevel_string='version 36 subversion 0'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1203,10 +1203,10 @@ config_arg0='Configure'
 config_args=''
 config_argc=0
 PERL_REVISION=5
-PERL_VERSION=35
-PERL_SUBVERSION=12
+PERL_VERSION=36
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=35
-PERL_API_SUBVERSION=12
+PERL_API_VERSION=36
+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 13454eb986..b1e697f17f 100644
--- a/Cross/config.sh-arm-linux-n770
+++ b/Cross/config.sh-arm-linux-n770
@@ -31,12 +31,12 @@ afsroot='/afs'
 alignbytes='4'
 aphostname='/bin/hostname'
 api_revision='5'
-api_subversion='12'
-api_version='35'
-api_versionstring='5.35.12'
+api_subversion='0'
+api_version='36'
+api_versionstring='5.36.0'
 ar='ar'
-archlib='/usr/lib/perl5/5.35.12/armv4l-linux'
-archlibexp='/usr/lib/perl5/5.35.12/armv4l-linux'
+archlib='/usr/lib/perl5/5.36.0/armv4l-linux'
+archlibexp='/usr/lib/perl5/5.36.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.35.12/armv4l-linux/CORE'
+ccdlflags='-rdynamic -Wl,-rpath,/usr/lib/perl5/5.36.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'
@@ -829,7 +829,7 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='./install_me_here/usr/lib/perl5/5.35.12/armv4l-linux'
+installarchlib='./install_me_here/usr/lib/perl5/5.36.0/armv4l-linux'
 installbin='./install_me_here/usr/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -837,13 +837,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.35.12'
+installprivlib='./install_me_here/usr/lib/perl5/5.36.0'
 installscript='./install_me_here/usr/bin'
-installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.35.12/armv4l-linux'
+installsitearch='./install_me_here/usr/lib/perl5/site_perl/5.36.0/armv4l-linux'
 installsitebin='./install_me_here/usr/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.35.12'
+installsitelib='./install_me_here/usr/lib/perl5/site_perl/5.36.0'
 installsiteman1dir='./install_me_here/usr/share/man/man1'
 installsiteman3dir='./install_me_here/usr/share/man/man3'
 installsitescript='./install_me_here/usr/bin'
@@ -978,8 +978,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/usr/lib/perl5/5.35.12'
-privlibexp='/usr/lib/perl5/5.35.12'
+privlib='/usr/lib/perl5/5.36.0'
+privlibexp='/usr/lib/perl5/5.36.0'
 procselfexe='"/proc/self/exe"'
 prototype='define'
 ptrsize='4'
@@ -1044,17 +1044,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.35.12/armv4l-linux'
-sitearchexp='/usr/lib/perl5/site_perl/5.35.12/armv4l-linux'
+sitearch='/usr/lib/perl5/site_perl/5.36.0/armv4l-linux'
+sitearchexp='/usr/lib/perl5/site_perl/5.36.0/armv4l-linux'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/usr/lib/perl5/site_perl/5.35.12'
+sitelib='/usr/lib/perl5/site_perl/5.36.0'
 sitelib_stem='/usr/lib/perl5/site_perl'
-sitelibexp='/usr/lib/perl5/site_perl/5.35.12'
+sitelibexp='/usr/lib/perl5/site_perl/5.36.0'
 siteman1dir='/usr/share/man/man1'
 siteman1direxp='/usr/share/man/man1'
 siteman3dir='/usr/share/man/man3'
@@ -1095,7 +1095,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/usr/include/string.h'
 submit=''
-subversion='12'
+subversion='0'
 sysman='/usr/share/man/man1'
 tail=''
 tar=''
@@ -1186,8 +1186,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.35.12'
-version_patchlevel_string='version 35 subversion 12'
+version='5.36.0'
+version_patchlevel_string='version 36 subversion 0'
 versiononly='undef'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1201,10 +1201,10 @@ config_arg0='Configure'
 config_args=''
 config_argc=0
 PERL_REVISION=5
-PERL_VERSION=35
-PERL_SUBVERSION=12
+PERL_VERSION=36
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=35
-PERL_API_SUBVERSION=12
+PERL_API_VERSION=36
+PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/INSTALL b/INSTALL
index dc6a6c7501..4e74bd4ce7 100644
--- a/INSTALL
+++ b/INSTALL
@@ -683,7 +683,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.35.12.
+By default, Configure will use the following directories for 5.36.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
@@ -2506,7 +2506,7 @@ L<https://www.chiark.greenend.org.uk/~sgtatham/bugs.html>
 
 =head1 Coexistence with earlier versions of perl 5
 
-Perl 5.35.12 is not binary compatible with earlier versions of Perl.
+Perl 5.36.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 stable version of Perl
@@ -2581,9 +2581,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.35.12
+	sh Configure -Dprefix=/opt/perl5.36.0
 
-and adding /opt/perl5.35.12/bin to the shell PATH variable.  Such users
+and adding /opt/perl5.36.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.
 
@@ -2598,11 +2598,11 @@ yet.
 
 =head2 Upgrading from 5.35.11 or earlier
 
-B<Perl 5.35.12 may not be binary compatible with Perl 5.35.11 or
+B<Perl 5.36.0 may not be binary compatible with Perl 5.35.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.35.12.  If you find you do need to rebuild an extension with
-5.35.12, you may safely do so without disturbing the older
+used with 5.36.0.  If you find you do need to rebuild an extension with
+5.36.0, you may safely do so without disturbing the older
 installations.  (See L<"Coexistence with earlier versions of perl 5">
 above.)
 
@@ -2635,15 +2635,15 @@ Firstly, the bare minimum to run this script
      print("$f\n");
   }
 
-in Linux with perl-5.35.12 is as follows (under $Config{prefix}):
+in Linux with perl-5.36.0 is as follows (under $Config{prefix}):
 
   ./bin/perl
-  ./lib/perl5/5.35.12/strict.pm
-  ./lib/perl5/5.35.12/warnings.pm
-  ./lib/perl5/5.35.12/i686-linux/File/Glob.pm
-  ./lib/perl5/5.35.12/feature.pm
-  ./lib/perl5/5.35.12/XSLoader.pm
-  ./lib/perl5/5.35.12/i686-linux/auto/File/Glob/Glob.so
+  ./lib/perl5/5.36.0/strict.pm
+  ./lib/perl5/5.36.0/warnings.pm
+  ./lib/perl5/5.36.0/i686-linux/File/Glob.pm
+  ./lib/perl5/5.36.0/feature.pm
+  ./lib/perl5/5.36.0/XSLoader.pm
+  ./lib/perl5/5.36.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 aaca651753..06907ce560 100644
--- a/META.json
+++ b/META.json
@@ -118,6 +118,6 @@
          "url" : "https://github.com/Perl/perl5"
       }
    },
-   "version" : "5.035012",
+   "version" : "5.036000",
    "x_serialization_backend" : "JSON::PP version 4.07"
 }
diff --git a/META.yml b/META.yml
index 5fd1790e89..2bfde7bff2 100644
--- a/META.yml
+++ b/META.yml
@@ -105,5 +105,5 @@ resources:
   homepage: https://www.perl.org/
   license: https://dev.perl.org/licenses/
   repository: https://github.com/Perl/perl5
-version: '5.035012'
+version: '5.036000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/Porting/config.sh b/Porting/config.sh
index 318de875dd..91086e62aa 100644
--- a/Porting/config.sh
+++ b/Porting/config.sh
@@ -46,12 +46,12 @@ afsroot='/afs'
 alignbytes='16'
 aphostname=''
 api_revision='5'
-api_subversion='12'
-api_version='35'
-api_versionstring='5.35.12'
+api_subversion='0'
+api_version='36'
+api_versionstring='5.36.0'
 ar='ar'
-archlib='/opt/perl/lib/5.35.12/x86_64-linux-thread-multi-ld'
-archlibexp='/opt/perl/lib/5.35.12/x86_64-linux-thread-multi-ld'
+archlib='/opt/perl/lib/5.36.0/x86_64-linux-thread-multi-ld'
+archlibexp='/opt/perl/lib/5.36.0/x86_64-linux-thread-multi-ld'
 archname64=''
 archname='x86_64-linux-thread-multi-ld'
 archobjs=''
@@ -860,7 +860,7 @@ incpath=''
 incpth='/usr/lib64/gcc/x86_64-suse-linux/10/include /usr/local/include /usr/lib64/gcc/x86_64-suse-linux/10/include-fixed /usr/lib64/gcc/x86_64-suse-linux/10/../../../../x86_64-suse-linux/include /usr/include'
 inews=''
 initialinstalllocation='/opt/perl/bin'
-installarchlib='/opt/perl/lib/5.35.12/x86_64-linux-thread-multi-ld'
+installarchlib='/opt/perl/lib/5.36.0/x86_64-linux-thread-multi-ld'
 installbin='/opt/perl/bin'
 installhtml1dir=''
 installhtml3dir=''
@@ -868,13 +868,13 @@ installman1dir='/opt/perl/man/man1'
 installman3dir='/opt/perl/man/man3'
 installprefix='/opt/perl'
 installprefixexp='/opt/perl'
-installprivlib='/opt/perl/lib/5.35.12'
+installprivlib='/opt/perl/lib/5.36.0'
 installscript='/opt/perl/bin'
-installsitearch='/opt/perl/lib/site_perl/5.35.12/x86_64-linux-thread-multi-ld'
+installsitearch='/opt/perl/lib/site_perl/5.36.0/x86_64-linux-thread-multi-ld'
 installsitebin='/opt/perl/bin'
 installsitehtml1dir=''
 installsitehtml3dir=''
-installsitelib='/opt/perl/lib/site_perl/5.35.12'
+installsitelib='/opt/perl/lib/site_perl/5.36.0'
 installsiteman1dir='/opt/perl/man/man1'
 installsiteman3dir='/opt/perl/man/man3'
 installsitescript='/opt/perl/bin'
@@ -1000,7 +1000,7 @@ perl_static_inline='static __inline__'
 perl_thread_local=''
 perladmin='yourname@yourhost.yourplace.com'
 perllibs='-lpthread -lnsl -ldl -lm -lcrypt -lutil -lc'
-perlpath='/opt/perl/bin/perl5.35.12'
+perlpath='/opt/perl/bin/perl5.36.0'
 pg='pg'
 phostname=''
 pidtype='pid_t'
@@ -1009,8 +1009,8 @@ pmake=''
 pr=''
 prefix='/opt/perl'
 prefixexp='/opt/perl'
-privlib='/opt/perl/lib/5.35.12'
-privlibexp='/opt/perl/lib/5.35.12'
+privlib='/opt/perl/lib/5.36.0'
+privlibexp='/opt/perl/lib/5.36.0'
 procselfexe='"/proc/self/exe"'
 ptrsize='8'
 quadkind='2'
@@ -1075,17 +1075,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, 0'
 sig_size='68'
 signal_t='void'
-sitearch='/opt/perl/lib/site_perl/5.35.12/x86_64-linux-thread-multi-ld'
-sitearchexp='/opt/perl/lib/site_perl/5.35.12/x86_64-linux-thread-multi-ld'
+sitearch='/opt/perl/lib/site_perl/5.36.0/x86_64-linux-thread-multi-ld'
+sitearchexp='/opt/perl/lib/site_perl/5.36.0/x86_64-linux-thread-multi-ld'
 sitebin='/opt/perl/bin'
 sitebinexp='/opt/perl/bin'
 sitehtml1dir=''
 sitehtml1direxp=''
 sitehtml3dir=''
 sitehtml3direxp=''
-sitelib='/opt/perl/lib/site_perl/5.35.12'
+sitelib='/opt/perl/lib/site_perl/5.36.0'
 sitelib_stem='/opt/perl/lib/site_perl'
-sitelibexp='/opt/perl/lib/site_perl/5.35.12'
+sitelibexp='/opt/perl/lib/site_perl/5.36.0'
 siteman1dir='/opt/perl/man/man1'
 siteman1direxp='/opt/perl/man/man1'
 siteman3dir='/opt/perl/man/man3'
@@ -1113,7 +1113,7 @@ st_dev_sign='1'
 st_dev_size='4'
 st_ino_sign='1'
 st_ino_size='8'
-startperl='#!/opt/perl/bin/perl5.35.12'
+startperl='#!/opt/perl/bin/perl5.36.0'
 startsh='#!/bin/sh'
 static_ext=' '
 stdchar='char'
@@ -1125,7 +1125,7 @@ stdio_ptr='((fp)->_ptr)'
 stdio_stream_array=''
 strerror_r_proto='REENTRANT_PROTO_B_IBW'
 submit=''
-subversion='12'
+subversion='0'
 sysman='/usr/share/man/man1'
 sysroot=''
 tail=''
@@ -1224,8 +1224,8 @@ vendorprefix=''
 vendorprefixexp=''
 vendorscript=''
 vendorscriptexp=''
-version='5.35.12'
-version_patchlevel_string='version 35 subversion 12'
+version='5.36.0'
+version_patchlevel_string='version 36 subversion 0'
 versiononly='define'
 vi=''
 xlibpth='/usr/lib/386 /lib/386'
@@ -1235,11 +1235,11 @@ yaccflags=''
 zcat=''
 zip='zip'
 PERL_REVISION=5
-PERL_VERSION=35
-PERL_SUBVERSION=12
+PERL_VERSION=36
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=35
-PERL_API_SUBVERSION=12
+PERL_API_VERSION=36
+PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=''
 PERL_CONFIG_SH=true
 : Variables propagated from previous config.sh file.
diff --git a/Porting/config_H b/Porting/config_H
index cae1c2140a..80692093f6 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.35.12/x86_64-linux"		/**/
-#define ARCHLIB_EXP "/opt/perl/lib/5.35.12/x86_64-linux"		/**/
+#define ARCHLIB "/opt/perl/lib/5.36.0/x86_64-linux"		/**/
+#define ARCHLIB_EXP "/opt/perl/lib/5.36.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.35.12"		/**/
-#define PRIVLIB_EXP "/opt/perl/lib/5.35.12"		/**/
+#define PRIVLIB "/opt/perl/lib/5.36.0"		/**/
+#define PRIVLIB_EXP "/opt/perl/lib/5.36.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.35.12/x86_64-linux"		/**/
-#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.35.12/x86_64-linux"		/**/
+#define SITEARCH "/opt/perl/lib/site_perl/5.36.0/x86_64-linux"		/**/
+#define SITEARCH_EXP "/opt/perl/lib/site_perl/5.36.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.35.12"		/**/
-#define SITELIB_EXP "/opt/perl/lib/site_perl/5.35.12"		/**/
+#define SITELIB "/opt/perl/lib/site_perl/5.36.0"		/**/
+#define SITELIB_EXP "/opt/perl/lib/site_perl/5.36.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.35.12"		/**/
+#define STARTPERL "#!/opt/perl/bin/perl5.36.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 7110377a1a..f0a104866e 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.35.12..HEAD
+  perl Porting/acknowledgements.pl v5.36.0..HEAD
 
 =head1 Reporting Bugs
 
diff --git a/Porting/todo.pod b/Porting/todo.pod
index d9f723d4e4..a775b20127 100644
--- a/Porting/todo.pod
+++ b/Porting/todo.pod
@@ -486,7 +486,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.35.12.
+options would be nice for perl 5.36.0.
 
 =head2 Profile Perl - am I hot or not?
 
@@ -1183,7 +1183,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.35.12"
+of 5.36.0"
 
 =head2 make ithreads more robust
 
diff --git a/README.haiku b/README.haiku
index c5826a7ad2..cd142d0329 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.35.12/BePC-haiku/CORE/libperl.so .
+  cd /boot/common/lib; ln -s perl5/5.36.0/BePC-haiku/CORE/libperl.so .
 
-Replace C<5.35.12> with your respective version of Perl.
+Replace C<5.36.0> with your respective version of Perl.
 
 =head1 KNOWN PROBLEMS
 
diff --git a/README.macosx b/README.macosx
index 92102a0376..407b01d2bd 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 https://www.cpan.org/src/perl-5.35.12.tar.gz
-  tar -xzf perl-5.35.12.tar.gz
-  cd perl-5.35.12
+  curl -O https://www.cpan.org/src/perl-5.36.0.tar.gz
+  tar -xzf perl-5.36.0.tar.gz
+  cd perl-5.36.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.35.12 as of this writing) builds without changes
+The latest Perl release (5.36.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 275ce732a0..a3fe1dfc8f 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.35.12/
+  unzip perl_ste.zip -d f:/perllib/lib/site_perl/5.36.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 17f9d824dc..0981579fa5 100644
--- a/README.vms
+++ b/README.vms
@@ -137,11 +137,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^.35^.12.tar
+    vmstar -xvf perl-5^.36^.0.tar
 
 Then set default to the top-level source directory like so:
 
-    set default [.perl-5^.35^.12]
+    set default [.perl-5^.36^.0]
 
 and proceed with configuration as described in the next section.
 
diff --git a/README.win32 b/README.win32
index 45b8af8482..bad9e5be75 100644
--- a/README.win32
+++ b/README.win32
@@ -232,7 +232,7 @@ Be sure to read the instructions near the top of the makefiles carefully.
 Type "gmake" (or "nmake" if you are using that make).
 
 This should build everything.  Specifically, it will create perl.exe,
-perl535.dll at the perl toplevel, and various other extension dll's
+perl536.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 3960846883..8c5fce6dee 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.35.12
+# mkdir -p /opt/perl-catamount/lib/perl5/5.36.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.35.12
+# cp -pr lib/* /opt/perl-catamount/lib/perl5/5.36.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/patchlevel.h b/patchlevel.h
index 229528b2b0..720022b440 100644
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -38,8 +38,8 @@ Instead use one of the version comparison macros.  See C<L</PERL_VERSION_EQ>>.
  * exactly on the third column */
 
 #define PERL_REVISION	5		/* age */
-#define PERL_VERSION	35		/* epoch */
-#define PERL_SUBVERSION	12		/* generation */
+#define PERL_VERSION	36		/* epoch */
+#define PERL_SUBVERSION	0		/* generation */
 
 /* The following numbers describe the earliest compatible version of
    Perl ("compatibility" here being defined as sufficient binary/API
@@ -59,8 +59,8 @@ Instead use one of the version comparison macros.  See C<L</PERL_VERSION_EQ>>.
    changing them should not be necessary.
 */
 #define PERL_API_REVISION	5
-#define PERL_API_VERSION	35
-#define PERL_API_SUBVERSION	12
+#define PERL_API_VERSION	36
+#define PERL_API_SUBVERSION	0
 /*
    XXX Note:  The selection of non-default Configure options, such
    as -Duselonglong may invalidate these settings.  Currently, Configure
@@ -157,6 +157,7 @@ hunk.
 #  endif
 static const char * const local_patches[] = {
         NULL
+        ,"RC0"
 #ifdef PERL_GIT_UNCOMMITTED_CHANGES
         ,"uncommitted-changes"
 #endif
diff --git a/plan9/config_sh.sample b/plan9/config_sh.sample
index bc3adbfeec..02b46570c1 100644
--- a/plan9/config_sh.sample
+++ b/plan9/config_sh.sample
@@ -31,12 +31,12 @@ afsroot='/afs'
 alignbytes='4'
 aphostname='/bin/uname -n'
 api_revision='5'
-api_subversion='12'
-api_version='35'
-api_versionstring='5.35.12'
+api_subversion='0'
+api_version='36'
+api_versionstring='5.36.0'
 ar='ar'
-archlib='/sys/lib/perl5/5.35.12/386'
-archlibexp='/sys/lib/perl5/5.35.12/386'
+archlib='/sys/lib/perl5/5.36.0/386'
+archlibexp='/sys/lib/perl5/5.36.0/386'
 archname64=''
 archname='386'
 archobjs=''
@@ -825,17 +825,17 @@ inc_version_list=' '
 inc_version_list_init='0'
 incpath=''
 inews=''
-installarchlib='/sys/lib/perl/5.35.12/386'
+installarchlib='/sys/lib/perl/5.36.0/386'
 installbin='/usr/bin'
 installman1dir='/sys/man/1pub'
 installman3dir='/sys/man/2pub'
 installprefix='/usr'
 installprefixexp='/usr'
-installprivlib='/sys/lib/perl/5.35.12'
+installprivlib='/sys/lib/perl/5.36.0'
 installscript='/usr/bin'
-installsitearch='/sys/lib/perl/5.35.12/site_perl/386'
+installsitearch='/sys/lib/perl/5.36.0/site_perl/386'
 installsitebin='/usr/bin'
-installsitelib='/sys/lib/perl/5.35.12/site_perl'
+installsitelib='/sys/lib/perl/5.36.0/site_perl'
 installstyle='lib/perl5'
 installusrbinperl='undef'
 installvendorarch=''
@@ -961,8 +961,8 @@ pmake=''
 pr=''
 prefix='/usr'
 prefixexp='/usr'
-privlib='/sys/lib/perl/5.35.12'
-privlibexp='/sys/lib/perl/5.35.12'
+privlib='/sys/lib/perl/5.36.0'
+privlibexp='/sys/lib/perl/5.36.0'
 procselfexe=''
 prototype='define'
 ptrsize='4'
@@ -1027,13 +1027,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.35.12/site_perl/386'
+sitearch='/sys/lib/perl/5.36.0/site_perl/386'
 sitearchexp='/sys/lib/perl/site_perl/386'
 sitebin='/usr/bin'
 sitebinexp='/usr/bin'
-sitelib='/sys/lib/perl/5.35.12/site_perl'
-sitelib_stem='/sys/lib/perl/5.35.12/site_perl'
-sitelibexp='/sys/lib/perl/5.35.12/site_perl'
+sitelib='/sys/lib/perl/5.36.0/site_perl'
+sitelib_stem='/sys/lib/perl/5.36.0/site_perl'
+sitelibexp='/sys/lib/perl/5.36.0/site_perl'
 siteprefix='/usr'
 siteprefixexp='/usr'
 sizesize='4'
@@ -1068,7 +1068,7 @@ stdio_stream_array=''
 strerror_r_proto='0'
 strings='/sys/include/ape/string.h'
 submit=''
-subversion='12'
+subversion='0'
 sysman='/sys/man/1pub'
 tail=''
 tar=''
@@ -1149,8 +1149,8 @@ vendorlib_stem=''
 vendorlibexp=''
 vendorprefix=''
 vendorprefixexp=''
-version='5.35.12'
-version_patchlevel_string='version 35 subversion 12'
+version='5.36.0'
+version_patchlevel_string='version 36 subversion 0'
 versiononly='undef'
 vi=''
 xlibpth=''
@@ -1164,10 +1164,10 @@ config_arg0='./Configure'
 config_args=''
 config_argc=0
 PERL_REVISION=5
-PERL_VERSION=35
-PERL_SUBVERSION=12
+PERL_VERSION=36
+PERL_SUBVERSION=0
 PERL_API_REVISION=5
-PERL_API_VERSION=35
-PERL_API_SUBVERSION=12
+PERL_API_VERSION=36
+PERL_API_SUBVERSION=0
 PERL_PATCHLEVEL=
 PERL_CONFIG_SH=true
diff --git a/uconfig.h b/uconfig.h
index 9265bc647d..8d3241b130 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.35/unknown"		/ **/
-/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.35/unknown"		/ **/
+/*#define ARCHLIB "/usr/local/lib/perl5/5.36/unknown"		/ **/
+/*#define ARCHLIB_EXP "/usr/local/lib/perl5/5.36/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.35"		/**/
-#define PRIVLIB_EXP "/usr/local/lib/perl5/5.35"		/**/
+#define PRIVLIB "/usr/local/lib/perl5/5.36"		/**/
+#define PRIVLIB_EXP "/usr/local/lib/perl5/5.36"		/**/
 
 /* 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.35/unknown"		/ **/
-/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.35/unknown"		/ **/
+/*#define SITEARCH "/usr/local/lib/perl5/5.36/unknown"		/ **/
+/*#define SITEARCH_EXP "/usr/local/lib/perl5/5.36/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.35"		/**/
-#define SITELIB_EXP "/usr/local/lib/perl5/5.35"		/**/
+#define SITELIB "/usr/local/lib/perl5/5.36"		/**/
+#define SITELIB_EXP "/usr/local/lib/perl5/5.36"		/**/
 #define SITELIB_STEM "/usr/local/lib/perl5"		/**/
 
 /* PERL_VENDORARCH:
diff --git a/uconfig.sh b/uconfig.sh
index 08ff3dae1d..83fdd49ad8 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.35/unknown'
-archlibexp='/usr/local/lib/perl5/5.35/unknown'
+archlib='/usr/local/lib/perl5/5.36/unknown'
+archlibexp='/usr/local/lib/perl5/5.36/unknown'
 archname='unknown'
 asctime_r_proto='0'
 bin='/usr/local/bin'
@@ -789,8 +789,8 @@ perl_static_inline='static'
 perl_thread_local=''
 phostname='hostname'
 pidtype=int
-privlib='/usr/local/lib/perl5/5.35'
-privlibexp='/usr/local/lib/perl5/5.35'
+privlib='/usr/local/lib/perl5/5.36'
+privlibexp='/usr/local/lib/perl5/5.36'
 procselfexe=''
 prototype='undef'
 ptrsize='4'
@@ -840,11 +840,11 @@ sig_name_init='0'
 sig_num_init='0'
 sig_size='1'
 signal_t=int
-sitearch='/usr/local/lib/perl5/5.35/unknown'
-sitearchexp='/usr/local/lib/perl5/5.35/unknown'
-sitelib='/usr/local/lib/perl5/5.35'
+sitearch='/usr/local/lib/perl5/5.36/unknown'
+sitearchexp='/usr/local/lib/perl5/5.36/unknown'
+sitelib='/usr/local/lib/perl5/5.36'
 sitelib_stem='/usr/local/lib/perl5'
-sitelibexp='/usr/local/lib/perl5/5.35'
+sitelibexp='/usr/local/lib/perl5/5.36'
 sizesize=4
 sizetype='size_t'
 socksizetype='int'
diff --git a/uconfig64.sh b/uconfig64.sh
index c64ef0f015..403e00fe38 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.35/unknown'
-archlibexp='/usr/local/lib/perl5/5.35/unknown'
+archlib='/usr/local/lib/perl5/5.36/unknown'
+archlibexp='/usr/local/lib/perl5/5.36/unknown'
 archname='unknown64'
 asctime_r_proto='0'
 bin='/usr/local/bin'
@@ -789,8 +789,8 @@ perl_static_inline='static'
 perl_thread_local=''
 phostname='hostname'
 pidtype=int
-privlib='/usr/local/lib/perl5/5.35'
-privlibexp='/usr/local/lib/perl5/5.35'
+privlib='/usr/local/lib/perl5/5.36'
+privlibexp='/usr/local/lib/perl5/5.36'
 procselfexe=''
 prototype='undef'
 ptrsize='8'
@@ -840,11 +840,11 @@ sig_name_init='0'
 sig_num_init='0'
 sig_size='1'
 signal_t=int
-sitearch='/usr/local/lib/perl5/5.35/unknown'
-sitearchexp='/usr/local/lib/perl5/5.35/unknown'
-sitelib='/usr/local/lib/perl5/5.35'
+sitearch='/usr/local/lib/perl5/5.36/unknown'
+sitearchexp='/usr/local/lib/perl5/5.36/unknown'
+sitelib='/usr/local/lib/perl5/5.36'
 sitelib_stem='/usr/local/lib/perl5'
-sitelibexp='/usr/local/lib/perl5/5.35'
+sitelibexp='/usr/local/lib/perl5/5.36'
 sizesize=4
 sizetype='size_t'
 socksizetype='int'
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 9145c24ec1..375ed129ca 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -6,7 +6,7 @@
 #	MinGW64 with gcc-4.4.3 or later
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl535.dll).  Also makes individual DLLs for the XS extensions.
+# (perl536.dll).  Also makes individual DLLs for the XS extensions.
 #
 # The easiest way to customize the build process is to use parameters like this:
 #
@@ -63,7 +63,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.35.12
+#INST_VER	:= \5.36.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -219,7 +219,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 perl535s.lib will also be created.
+# variables below. A static library perl536s.lib will also be created.
 # Ordinary perl.exe is not affected by this option.
 #
 #BUILD_STATIC	:= define
@@ -899,9 +899,9 @@ ifeq ($(CCTYPE),GCC)
 
 CFGSH_TMPL	= config.gc
 CFGH_TMPL	= config_H.gc
-PERLIMPLIB	= $(COREDIR)\libperl535$(a)
-PERLIMPLIBBASE	= libperl535$(a)
-PERLSTATICLIB	= ..\libperl535s$(a)
+PERLIMPLIB	= $(COREDIR)\libperl536$(a)
+PERLIMPLIBBASE	= libperl536$(a)
+PERLSTATICLIB	= ..\libperl536s$(a)
 INT64		= long long
 
 else
@@ -914,12 +914,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)\perl535$(a)
-PERLIMPLIBBASE	?= perl535$(a)
-PERLEXPLIB	?= $(COREDIR)\perl535.exp
-PERLSTATICLIB	?= ..\perl535s$(a)
-PERLDLL		= ..\perl535.dll
-PERLDLLBASE	= perl535.dll
+PERLIMPLIB	?= $(COREDIR)\perl536$(a)
+PERLIMPLIBBASE	?= perl536$(a)
+PERLEXPLIB	?= $(COREDIR)\perl536.exp
+PERLSTATICLIB	?= ..\perl536s$(a)
+PERLDLL		= ..\perl536.dll
+PERLDLLBASE	= perl536.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 d9b7b3615d..47d544af95 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -4,7 +4,7 @@
 #	Microsoft Visual C++ 12.0 or later
 #
 # This is set up to build a perl.exe that runs off a shared library
-# (perl535.dll).  Also makes individual DLLs for the XS extensions.
+# (perl536.dll).  Also makes individual DLLs for the XS extensions.
 #
 
 ##
@@ -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.35.12
+#INST_VER	= \5.36.0
 
 #
 # Comment this out if you DON'T want your perl installation to have
@@ -171,7 +171,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 perl535s.lib will also be created.
+# variables below. A static library perl536s.lib will also be created.
 # Ordinary perl.exe is not affected by this option.
 #
 #BUILD_STATIC	= define
@@ -579,9 +579,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	= ..\perl535.lib
-PERLSTATICLIB	= ..\perl535s.lib
-PERLDLL		= ..\perl535.dll
+PERLIMPLIB	= ..\perl536.lib
+PERLSTATICLIB	= ..\perl536s.lib
+PERLDLL		= ..\perl536.dll
 
 MINIPERL	= ..\miniperl.exe
 MINIDIR		= .\mini