diff --git a/5.008.009-main,threaded-jessie/DevelPatchPerl.patch b/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
index 8dee9f0..0848952 100644
--- a/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.008.009-main,threaded-jessie/DevelPatchPerl.patch
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
  	}
      }
  
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/perl.c b/perl.c
 index 82e5538..b9e02fe 100644
 --- a/perl.c
diff --git a/5.008.009-main-jessie/DevelPatchPerl.patch b/5.008.009-main-jessie/DevelPatchPerl.patch
index 8dee9f0..0848952 100644
--- a/5.008.009-main-jessie/DevelPatchPerl.patch
+++ b/5.008.009-main-jessie/DevelPatchPerl.patch
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
  	}
      }
  
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/perl.c b/perl.c
 index 82e5538..b9e02fe 100644
 --- a/perl.c
diff --git a/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch b/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
index 8dee9f0..0848952 100644
--- a/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.008.009-slim,threaded-jessie/DevelPatchPerl.patch
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
  	}
      }
  
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/perl.c b/perl.c
 index 82e5538..b9e02fe 100644
 --- a/perl.c
diff --git a/5.008.009-slim-jessie/DevelPatchPerl.patch b/5.008.009-slim-jessie/DevelPatchPerl.patch
index 8dee9f0..0848952 100644
--- a/5.008.009-slim-jessie/DevelPatchPerl.patch
+++ b/5.008.009-slim-jessie/DevelPatchPerl.patch
@@ -492,6 +492,54 @@ index 030db74..0d15a40 100644
  	}
      }
  
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/perl.c b/perl.c
 index 82e5538..b9e02fe 100644
 --- a/perl.c
diff --git a/5.010.001-main,threaded-jessie/DevelPatchPerl.patch b/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
index db9f522..cfc7b84 100644
--- a/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.010.001-main,threaded-jessie/DevelPatchPerl.patch
@@ -118,6 +118,44 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
 index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
@@ -576,6 +614,54 @@ index e400dda..e25e31a 100755
  ### warn if we are going to skip long file names
  if ($TOO_LONG) {
      diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/lib/h2ph.t b/lib/h2ph.t
 index 27dd7b9..947fae6 100755
 --- a/lib/h2ph.t
diff --git a/5.010.001-main-jessie/DevelPatchPerl.patch b/5.010.001-main-jessie/DevelPatchPerl.patch
index db9f522..cfc7b84 100644
--- a/5.010.001-main-jessie/DevelPatchPerl.patch
+++ b/5.010.001-main-jessie/DevelPatchPerl.patch
@@ -118,6 +118,44 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
 index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
@@ -576,6 +614,54 @@ index e400dda..e25e31a 100755
  ### warn if we are going to skip long file names
  if ($TOO_LONG) {
      diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/lib/h2ph.t b/lib/h2ph.t
 index 27dd7b9..947fae6 100755
 --- a/lib/h2ph.t
diff --git a/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch b/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
index db9f522..cfc7b84 100644
--- a/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.010.001-slim,threaded-jessie/DevelPatchPerl.patch
@@ -118,6 +118,44 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
 index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
@@ -576,6 +614,54 @@ index e400dda..e25e31a 100755
  ### warn if we are going to skip long file names
  if ($TOO_LONG) {
      diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/lib/h2ph.t b/lib/h2ph.t
 index 27dd7b9..947fae6 100755
 --- a/lib/h2ph.t
diff --git a/5.010.001-slim-jessie/DevelPatchPerl.patch b/5.010.001-slim-jessie/DevelPatchPerl.patch
index db9f522..cfc7b84 100644
--- a/5.010.001-slim-jessie/DevelPatchPerl.patch
+++ b/5.010.001-slim-jessie/DevelPatchPerl.patch
@@ -118,6 +118,44 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
 diff --git a/hints/linux.sh b/hints/linux.sh
 index c88f157..8cbe7dc 100644
 --- a/hints/linux.sh
@@ -576,6 +614,54 @@ index e400dda..e25e31a 100755
  ### warn if we are going to skip long file names
  if ($TOO_LONG) {
      diag("No long filename support - long filename extraction disabled") if ! $ENV{PERL_CORE};
+diff --git a/lib/Time/Local.t b/lib/Time/Local.t
+index 4f8674f..5fff350 100755
+--- a/lib/Time/Local.t
++++ b/lib/Time/Local.t
+@@ -96,7 +96,7 @@ for (@time, @neg_time) {
+             if $year < 70 && ! $neg_epoch_ok;
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -110,7 +110,7 @@ for (@time, @neg_time) {
+         }
+ 
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -127,7 +127,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -136,14 +135,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/lib/h2ph.t b/lib/h2ph.t
 index 27dd7b9..947fae6 100755
 --- a/lib/h2ph.t
diff --git a/5.012.005-main,threaded-jessie/DevelPatchPerl.patch b/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
index 08cf94b..a6e563c 100644
--- a/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.012.005-main,threaded-jessie/DevelPatchPerl.patch
@@ -143,6 +143,92 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
+diff --git a/ext/Time-Local/t/Local.t b/ext/Time-Local/t/Local.t
+index 61a15a8..8bf0a0b 100755
+--- a/ext/Time-Local/t/Local.t
++++ b/ext/Time-Local/t/Local.t
+@@ -84,7 +84,7 @@ for (@time, @neg_time) {
+ 
+     # Test timelocal()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -100,7 +100,7 @@ for (@time, @neg_time) {
+ 
+     # Test timegm()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -117,7 +117,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -126,14 +125,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.012.005-main-jessie/DevelPatchPerl.patch b/5.012.005-main-jessie/DevelPatchPerl.patch
index 08cf94b..a6e563c 100644
--- a/5.012.005-main-jessie/DevelPatchPerl.patch
+++ b/5.012.005-main-jessie/DevelPatchPerl.patch
@@ -143,6 +143,92 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
+diff --git a/ext/Time-Local/t/Local.t b/ext/Time-Local/t/Local.t
+index 61a15a8..8bf0a0b 100755
+--- a/ext/Time-Local/t/Local.t
++++ b/ext/Time-Local/t/Local.t
+@@ -84,7 +84,7 @@ for (@time, @neg_time) {
+ 
+     # Test timelocal()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -100,7 +100,7 @@ for (@time, @neg_time) {
+ 
+     # Test timegm()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -117,7 +117,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -126,14 +125,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch b/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
index 08cf94b..a6e563c 100644
--- a/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.012.005-slim,threaded-jessie/DevelPatchPerl.patch
@@ -143,6 +143,92 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
+diff --git a/ext/Time-Local/t/Local.t b/ext/Time-Local/t/Local.t
+index 61a15a8..8bf0a0b 100755
+--- a/ext/Time-Local/t/Local.t
++++ b/ext/Time-Local/t/Local.t
+@@ -84,7 +84,7 @@ for (@time, @neg_time) {
+ 
+     # Test timelocal()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -100,7 +100,7 @@ for (@time, @neg_time) {
+ 
+     # Test timegm()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -117,7 +117,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -126,14 +125,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.012.005-slim-jessie/DevelPatchPerl.patch b/5.012.005-slim-jessie/DevelPatchPerl.patch
index 08cf94b..a6e563c 100644
--- a/5.012.005-slim-jessie/DevelPatchPerl.patch
+++ b/5.012.005-slim-jessie/DevelPatchPerl.patch
@@ -143,6 +143,92 @@ index f8ca492..204bba0 100644
 +foreach (split / /, $Config{libpth}) {
 +    $self->{LIBS}->[0] .= ' -lgdbm_compat' if -e $_.'/libgdbm_compat.so';
  }
+diff --git a/ext/SDBM_File/sdbm/sdbm.c b/ext/SDBM_File/sdbm/sdbm.c
+index c5f7aa8..c7c329a 100644
+--- a/ext/SDBM_File/sdbm/sdbm.c
++++ b/ext/SDBM_File/sdbm/sdbm.c
+@@ -78,8 +78,8 @@ sdbm_open(register char *file, register int flags, register int mode)
+ 	register char *dirname;
+ 	register char *pagname;
+ 	size_t filelen;
+-	const size_t dirfext_len = sizeof(DIRFEXT "");
+-	const size_t pagfext_len = sizeof(PAGFEXT "");
++	const size_t dirfext_size = sizeof(DIRFEXT "");
++	const size_t pagfext_size = sizeof(PAGFEXT "");
+ 
+ 	if (file == NULL || !*file)
+ 		return errno = EINVAL, (DBM *) NULL;
+@@ -88,17 +88,17 @@ sdbm_open(register char *file, register int flags, register int mode)
+  */
+ 	filelen = strlen(file);
+ 
+-	if ((dirname = (char *) malloc(filelen + dirfext_len + 1
+-				       + filelen + pagfext_len + 1)) == NULL)
++	if ((dirname = (char *) malloc(filelen + dirfext_size
++				       + filelen + pagfext_size)) == NULL)
+ 		return errno = ENOMEM, (DBM *) NULL;
+ /*
+  * build the file names
+  */
+ 	memcpy(dirname, file, filelen);
+-	memcpy(dirname + filelen, DIRFEXT, dirfext_len + 1);
+-	pagname = dirname + filelen + dirfext_len + 1;
++	memcpy(dirname + filelen, DIRFEXT, dirfext_size);
++	pagname = dirname + filelen + dirfext_size;
+ 	memcpy(pagname, file, filelen);
+-	memcpy(pagname + filelen, PAGFEXT, pagfext_len + 1);
++	memcpy(pagname + filelen, PAGFEXT, pagfext_size);
+ 
+ 	db = sdbm_prep(dirname, pagname, flags, mode);
+ 	free((char *) dirname);
+diff --git a/ext/Time-Local/t/Local.t b/ext/Time-Local/t/Local.t
+index 61a15a8..8bf0a0b 100755
+--- a/ext/Time-Local/t/Local.t
++++ b/ext/Time-Local/t/Local.t
+@@ -84,7 +84,7 @@ for (@time, @neg_time) {
+ 
+     # Test timelocal()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -100,7 +100,7 @@ for (@time, @neg_time) {
+ 
+     # Test timegm()
+     {
+-        my $year_in = $year < 70 ? $year + 1900 : $year;
++        my $year_in = $year + 1900;
+         my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+         my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -117,7 +117,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -126,14 +125,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 0519eca..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.014.004-main,threaded-jessie/DevelPatchPerl.patch b/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
index e41e0f8..67efc8e 100644
--- a/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.014.004-main,threaded-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 0bb5c4f..2e1c0b9 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 56bc815..cf688be 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.014.004-main-jessie/DevelPatchPerl.patch b/5.014.004-main-jessie/DevelPatchPerl.patch
index e41e0f8..67efc8e 100644
--- a/5.014.004-main-jessie/DevelPatchPerl.patch
+++ b/5.014.004-main-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 0bb5c4f..2e1c0b9 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 56bc815..cf688be 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch b/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
index e41e0f8..67efc8e 100644
--- a/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.014.004-slim,threaded-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 0bb5c4f..2e1c0b9 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 56bc815..cf688be 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.014.004-slim-jessie/DevelPatchPerl.patch b/5.014.004-slim-jessie/DevelPatchPerl.patch
index e41e0f8..67efc8e 100644
--- a/5.014.004-slim-jessie/DevelPatchPerl.patch
+++ b/5.014.004-slim-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 0bb5c4f..2e1c0b9 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 56bc815..cf688be 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.016.003-main,threaded-jessie/DevelPatchPerl.patch b/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
index e3b594e..914a001 100644
--- a/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.016.003-main,threaded-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index fdbbf20..e517f41 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 439f254..a324604 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.016.003-main-jessie/DevelPatchPerl.patch b/5.016.003-main-jessie/DevelPatchPerl.patch
index e3b594e..914a001 100644
--- a/5.016.003-main-jessie/DevelPatchPerl.patch
+++ b/5.016.003-main-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index fdbbf20..e517f41 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 439f254..a324604 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch b/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
index e3b594e..914a001 100644
--- a/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.016.003-slim,threaded-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index fdbbf20..e517f41 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 439f254..a324604 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.016.003-slim-jessie/DevelPatchPerl.patch b/5.016.003-slim-jessie/DevelPatchPerl.patch
index e3b594e..914a001 100644
--- a/5.016.003-slim-jessie/DevelPatchPerl.patch
+++ b/5.016.003-slim-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index fdbbf20..e517f41 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 521cac0..0507a8d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -95,7 +95,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -111,7 +111,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -129,7 +129,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -138,14 +137,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index 439f254..a324604 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.018.004-main,threaded-jessie/DevelPatchPerl.patch b/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
index 6fdd9f8..89332ee 100644
--- a/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
+++ b/5.018.004-main,threaded-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 30ab78a..19213f2 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index b707911..2588f0b 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.018.004-main-jessie/DevelPatchPerl.patch b/5.018.004-main-jessie/DevelPatchPerl.patch
index 6fdd9f8..89332ee 100644
--- a/5.018.004-main-jessie/DevelPatchPerl.patch
+++ b/5.018.004-main-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 30ab78a..19213f2 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index b707911..2588f0b 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch b/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
index 6fdd9f8..89332ee 100644
--- a/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
+++ b/5.018.004-slim,threaded-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 30ab78a..19213f2 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index b707911..2588f0b 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.018.004-slim-jessie/DevelPatchPerl.patch b/5.018.004-slim-jessie/DevelPatchPerl.patch
index 6fdd9f8..89332ee 100644
--- a/5.018.004-slim-jessie/DevelPatchPerl.patch
+++ b/5.018.004-slim-jessie/DevelPatchPerl.patch
@@ -25,6 +25,54 @@ index 30ab78a..19213f2 100755
  : What should the include directory be ?
  echo " "
  $echo $n "Hmm...  $c"
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/ext/Errno/Errno_pm.PL b/ext/Errno/Errno_pm.PL
 index b707911..2588f0b 100644
 --- a/ext/Errno/Errno_pm.PL
diff --git a/5.020.003-main,threaded-stretch/DevelPatchPerl.patch b/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
index 60ca426..d2aa33d 100644
--- a/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.020.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.020.003-main-stretch/DevelPatchPerl.patch b/5.020.003-main-stretch/DevelPatchPerl.patch
index 60ca426..d2aa33d 100644
--- a/5.020.003-main-stretch/DevelPatchPerl.patch
+++ b/5.020.003-main-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
index 60ca426..d2aa33d 100644
--- a/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.020.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.020.003-slim-stretch/DevelPatchPerl.patch b/5.020.003-slim-stretch/DevelPatchPerl.patch
index 60ca426..d2aa33d 100644
--- a/5.020.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.020.003-slim-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 956adfc..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.022.004-main,threaded-stretch/DevelPatchPerl.patch b/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.022.004-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.022.004-main-stretch/DevelPatchPerl.patch b/5.022.004-main-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.022.004-main-stretch/DevelPatchPerl.patch
+++ b/5.022.004-main-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch b/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.022.004-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.022.004-slim-stretch/DevelPatchPerl.patch b/5.022.004-slim-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.022.004-slim-stretch/DevelPatchPerl.patch
+++ b/5.022.004-slim-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.024.004-main,threaded-stretch/DevelPatchPerl.patch b/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.024.004-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.024.004-main-stretch/DevelPatchPerl.patch b/5.024.004-main-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.024.004-main-stretch/DevelPatchPerl.patch
+++ b/5.024.004-main-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch b/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.024.004-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.024.004-slim-stretch/DevelPatchPerl.patch b/5.024.004-slim-stretch/DevelPatchPerl.patch
index 444d016..1ac0fbb 100644
--- a/5.024.004-slim-stretch/DevelPatchPerl.patch
+++ b/5.024.004-slim-stretch/DevelPatchPerl.patch
@@ -1,3 +1,51 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 472e71a..0a852a0 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -91,7 +91,7 @@ for (@time, @neg_time) {
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timelocal($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = localtime($time);
+@@ -107,7 +107,7 @@ for (@time, @neg_time) {
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
++            my $year_in = $year + 1900;
+             my $time = timegm($sec,$min,$hour,$mday,$mon,$year_in);
+ 
+             my($s,$m,$h,$D,$M,$Y) = gmtime($time);
+@@ -125,7 +125,6 @@ for (@time, @neg_time) {
+ 
+ for (@bad_time) {
+     my($year, $mon, $mday, $hour, $min, $sec) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm($sec,$min,$hour,$mday,$mon,$year) };
+@@ -134,14 +133,14 @@ for (@bad_time) {
+ }
+ 
+ {
+-    is(timelocal(0,0,1,1,0,90) - timelocal(0,0,0,1,0,90), 3600,
++    is(timelocal(0,0,1,1,0,1990) - timelocal(0,0,0,1,0,1990), 3600,
+        'one hour difference between two calls to timelocal');
+ 
+-    is(timelocal(1,2,3,1,0,100) - timelocal(1,2,3,31,11,99), 24 * 3600,
++    is(timelocal(1,2,3,1,0,2000) - timelocal(1,2,3,31,11,1999), 24 * 3600,
+        'one day difference between two calls to timelocal');
+ 
+     # Diff beween Jan 1, 1980 and Mar 1, 1980 = (31 + 29 = 60 days)
+-    is(timegm(0,0,0, 1, 2, 80) - timegm(0,0,0, 1, 0, 80), 60 * 24 * 3600,
++    is(timegm(0,0,0, 1, 2, 1980) - timegm(0,0,0, 1, 0, 1980), 60 * 24 * 3600,
+        '60 day difference between two calls to timegm');
+ }
+ 
 diff --git a/hints/linux.sh b/hints/linux.sh
 index fb5a46e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-main,threaded-buster/DevelPatchPerl.patch b/5.026.003-main,threaded-buster/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.026.003-main,threaded-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-main,threaded-stretch/DevelPatchPerl.patch b/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.026.003-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-main-buster/DevelPatchPerl.patch b/5.026.003-main-buster/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-main-buster/DevelPatchPerl.patch
+++ b/5.026.003-main-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-main-stretch/DevelPatchPerl.patch b/5.026.003-main-stretch/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-main-stretch/DevelPatchPerl.patch
+++ b/5.026.003-main-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-slim,threaded-buster/DevelPatchPerl.patch b/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.026.003-slim,threaded-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch b/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.026.003-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-slim-buster/DevelPatchPerl.patch b/5.026.003-slim-buster/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-slim-buster/DevelPatchPerl.patch
+++ b/5.026.003-slim-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.026.003-slim-stretch/DevelPatchPerl.patch b/5.026.003-slim-stretch/DevelPatchPerl.patch
index ae1c279..5f52bd5 100644
--- a/5.026.003-slim-stretch/DevelPatchPerl.patch
+++ b/5.026.003-slim-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index 3f38ea0..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-main,threaded-buster/DevelPatchPerl.patch b/5.028.002-main,threaded-buster/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-main,threaded-buster/DevelPatchPerl.patch
+++ b/5.028.002-main,threaded-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-main,threaded-stretch/DevelPatchPerl.patch b/5.028.002-main,threaded-stretch/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-main,threaded-stretch/DevelPatchPerl.patch
+++ b/5.028.002-main,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-main-buster/DevelPatchPerl.patch b/5.028.002-main-buster/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-main-buster/DevelPatchPerl.patch
+++ b/5.028.002-main-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-main-stretch/DevelPatchPerl.patch b/5.028.002-main-stretch/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-main-stretch/DevelPatchPerl.patch
+++ b/5.028.002-main-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-slim,threaded-buster/DevelPatchPerl.patch b/5.028.002-slim,threaded-buster/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-slim,threaded-buster/DevelPatchPerl.patch
+++ b/5.028.002-slim,threaded-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch b/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch
+++ b/5.028.002-slim,threaded-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-slim-buster/DevelPatchPerl.patch b/5.028.002-slim-buster/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-slim-buster/DevelPatchPerl.patch
+++ b/5.028.002-slim-buster/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.028.002-slim-stretch/DevelPatchPerl.patch b/5.028.002-slim-stretch/DevelPatchPerl.patch
index 11fdab0..0234f94 100644
--- a/5.028.002-slim-stretch/DevelPatchPerl.patch
+++ b/5.028.002-slim-stretch/DevelPatchPerl.patch
@@ -1,3 +1,93 @@
+diff --git a/cpan/Time-Local/t/Local.t b/cpan/Time-Local/t/Local.t
+index 6341396..701d22d 100644
+--- a/cpan/Time-Local/t/Local.t
++++ b/cpan/Time-Local/t/Local.t
+@@ -85,19 +85,17 @@ my $epoch_is_64
+ 
+ for ( @time, @neg_time ) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+ SKIP: {
+         skip '1970 test on VOS fails.', 12
+-            if $^O eq 'vos' && $year == 70;
++            if $^O eq 'vos' && $year == 1970;
+         skip 'this platform does not support negative epochs.', 12
+-            if $year < 70 && !$neg_epoch_ok;
++            if $year < 1970 && !$neg_epoch_ok;
+ 
+         # Test timelocal()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timelocal( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = localtime($time);
+ 
+@@ -106,13 +104,12 @@ SKIP: {
+             is( $h, $hour,     "timelocal hour for @$_" );
+             is( $D, $mday,     "timelocal day for @$_" );
+             is( $M, $mon,      "timelocal month for @$_" );
+-            is( $Y, $year,     "timelocal year for @$_" );
++            is( $Y, $year - 1900,     "timelocal year for @$_" );
+         }
+ 
+         # Test timegm()
+         {
+-            my $year_in = $year < 70 ? $year + 1900 : $year;
+-            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year_in );
++            my $time = timegm( $sec, $min, $hour, $mday, $mon, $year );
+ 
+             my ( $s, $m, $h, $D, $M, $Y ) = gmtime($time);
+ 
+@@ -121,14 +118,13 @@ SKIP: {
+             is( $h, $hour,     "timegm hour for @$_" );
+             is( $D, $mday,     "timegm day for @$_" );
+             is( $M, $mon,      "timegm month for @$_" );
+-            is( $Y, $year,     "timegm year for @$_" );
++            is( $Y, $year - 1900,     "timegm year for @$_" );
+         }
+     }
+ }
+ 
+ for (@bad_time) {
+     my ( $year, $mon, $mday, $hour, $min, $sec ) = @$_;
+-    $year -= 1900;
+     $mon--;
+ 
+     eval { timegm( $sec, $min, $hour, $mday, $mon, $year ) };
+@@ -229,6 +225,30 @@ SKIP:
+     );
+ }
+ 
++# 2-digit years
++{
++	my $current_year = ( localtime() )[5];
++	my $pre_break    = ( $current_year + 49 ) - 100;
++	my $break        = ( $current_year + 50 ) - 100;
++	my $post_break   = ( $current_year + 51 ) - 100;
++
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $pre_break ) ) )[5] ),
++		$pre_break + 100,
++		"year $pre_break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $break ) ) )[5] ),
++		$break + 100,
++		"year $break is treated as next century",
++	);
++	is(
++		( ( localtime( timelocal( 0, 0, 0, 1, 1, $post_break ) ) )[5] ),
++		$post_break,
++		"year $post_break is treated as current century",
++	);
++}
++
+ SKIP:
+ {
+     skip 'These tests only run for the package maintainer.', 8
 diff --git a/hints/linux.sh b/hints/linux.sh
 index a985a8e..8cbe7dc 100644
 --- a/hints/linux.sh
diff --git a/5.030.001-main,threaded-buster/DevelPatchPerl.patch b/5.030.002-main,threaded-buster/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-main,threaded-buster/DevelPatchPerl.patch
rename to 5.030.002-main,threaded-buster/DevelPatchPerl.patch
diff --git a/5.030.001-main,threaded-buster/Dockerfile b/5.030.002-main,threaded-buster/Dockerfile
similarity index 77%
rename from 5.030.001-main,threaded-buster/Dockerfile
rename to 5.030.002-main,threaded-buster/Dockerfile
index ddb3728..78af7b5 100644
--- a/5.030.001-main,threaded-buster/Dockerfile
+++ b/5.030.002-main,threaded-buster/Dockerfile
@@ -5,10 +5,10 @@ COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -26,4 +26,4 @@ RUN true \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-main,threaded-stretch/DevelPatchPerl.patch b/5.030.002-main,threaded-stretch/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-main,threaded-stretch/DevelPatchPerl.patch
rename to 5.030.002-main,threaded-stretch/DevelPatchPerl.patch
diff --git a/5.030.001-main,threaded-stretch/Dockerfile b/5.030.002-main,threaded-stretch/Dockerfile
similarity index 77%
rename from 5.030.001-main,threaded-stretch/Dockerfile
rename to 5.030.002-main,threaded-stretch/Dockerfile
index 41f86e2..344bdf2 100644
--- a/5.030.001-main,threaded-stretch/Dockerfile
+++ b/5.030.002-main,threaded-stretch/Dockerfile
@@ -5,10 +5,10 @@ COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -26,4 +26,4 @@ RUN true \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-main-buster/DevelPatchPerl.patch b/5.030.002-main-buster/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-main-buster/DevelPatchPerl.patch
rename to 5.030.002-main-buster/DevelPatchPerl.patch
diff --git a/5.030.001-main-buster/Dockerfile b/5.030.002-main-buster/Dockerfile
similarity index 77%
rename from 5.030.001-main-buster/Dockerfile
rename to 5.030.002-main-buster/Dockerfile
index 72083fc..2287b84 100644
--- a/5.030.001-main-buster/Dockerfile
+++ b/5.030.002-main-buster/Dockerfile
@@ -5,10 +5,10 @@ COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -26,4 +26,4 @@ RUN true \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-main-stretch/DevelPatchPerl.patch b/5.030.002-main-stretch/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-main-stretch/DevelPatchPerl.patch
rename to 5.030.002-main-stretch/DevelPatchPerl.patch
diff --git a/5.030.001-main-stretch/Dockerfile b/5.030.002-main-stretch/Dockerfile
similarity index 77%
rename from 5.030.001-main-stretch/Dockerfile
rename to 5.030.002-main-stretch/Dockerfile
index 85af65c..66ab04a 100644
--- a/5.030.001-main-stretch/Dockerfile
+++ b/5.030.002-main-stretch/Dockerfile
@@ -5,10 +5,10 @@ COPY *.patch /usr/src/perl/
 WORKDIR /usr/src/perl
 
 RUN true \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -26,4 +26,4 @@ RUN true \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-slim,threaded-buster/DevelPatchPerl.patch b/5.030.002-slim,threaded-buster/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-slim,threaded-buster/DevelPatchPerl.patch
rename to 5.030.002-slim,threaded-buster/DevelPatchPerl.patch
diff --git a/5.030.001-slim,threaded-buster/Dockerfile b/5.030.002-slim,threaded-buster/Dockerfile
similarity index 84%
rename from 5.030.001-slim,threaded-buster/Dockerfile
rename to 5.030.002-slim,threaded-buster/Dockerfile
index 5cfb2ff..d5684d0 100644
--- a/5.030.001-slim,threaded-buster/Dockerfile
+++ b/5.030.002-slim,threaded-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        # procps \
        # zlib1g-dev \
        xz-utils \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -50,4 +50,4 @@ RUN apt-get update \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-slim,threaded-stretch/DevelPatchPerl.patch b/5.030.002-slim,threaded-stretch/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-slim,threaded-stretch/DevelPatchPerl.patch
rename to 5.030.002-slim,threaded-stretch/DevelPatchPerl.patch
diff --git a/5.030.001-slim,threaded-stretch/Dockerfile b/5.030.002-slim,threaded-stretch/Dockerfile
similarity index 84%
rename from 5.030.001-slim,threaded-stretch/Dockerfile
rename to 5.030.002-slim,threaded-stretch/Dockerfile
index 1492eac..34066be 100644
--- a/5.030.001-slim,threaded-stretch/Dockerfile
+++ b/5.030.002-slim,threaded-stretch/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        # procps \
        # zlib1g-dev \
        xz-utils \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -50,4 +50,4 @@ RUN apt-get update \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-slim-buster/DevelPatchPerl.patch b/5.030.002-slim-buster/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-slim-buster/DevelPatchPerl.patch
rename to 5.030.002-slim-buster/DevelPatchPerl.patch
diff --git a/5.030.001-slim-buster/Dockerfile b/5.030.002-slim-buster/Dockerfile
similarity index 84%
rename from 5.030.001-slim-buster/Dockerfile
rename to 5.030.002-slim-buster/Dockerfile
index e65c394..e786d46 100644
--- a/5.030.001-slim-buster/Dockerfile
+++ b/5.030.002-slim-buster/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        # procps \
        # zlib1g-dev \
        xz-utils \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -50,4 +50,4 @@ RUN apt-get update \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/5.030.001-slim-stretch/DevelPatchPerl.patch b/5.030.002-slim-stretch/DevelPatchPerl.patch
similarity index 100%
rename from 5.030.001-slim-stretch/DevelPatchPerl.patch
rename to 5.030.002-slim-stretch/DevelPatchPerl.patch
diff --git a/5.030.001-slim-stretch/Dockerfile b/5.030.002-slim-stretch/Dockerfile
similarity index 84%
rename from 5.030.001-slim-stretch/Dockerfile
rename to 5.030.002-slim-stretch/Dockerfile
index 0d9e552..bdf4389 100644
--- a/5.030.001-slim-stretch/Dockerfile
+++ b/5.030.002-slim-stretch/Dockerfile
@@ -25,10 +25,10 @@ RUN apt-get update \
        # procps \
        # zlib1g-dev \
        xz-utils \
-    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.1.tar.xz -o perl-5.30.1.tar.xz \
-    && echo '7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35 *perl-5.30.1.tar.xz' | sha256sum -c - \
-    && tar --strip-components=1 -xaf perl-5.30.1.tar.xz -C /usr/src/perl \
-    && rm perl-5.30.1.tar.xz \
+    && curl -SL https://www.cpan.org/src/5.0/perl-5.30.2.tar.xz -o perl-5.30.2.tar.xz \
+    && echo 'a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259 *perl-5.30.2.tar.xz' | sha256sum -c - \
+    && tar --strip-components=1 -xaf perl-5.30.2.tar.xz -C /usr/src/perl \
+    && rm perl-5.30.2.tar.xz \
     && cat *.patch | patch -p1 \
     && gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)" \
     && archBits="$(dpkg-architecture --query DEB_BUILD_ARCH_BITS)" \
@@ -50,4 +50,4 @@ RUN apt-get update \
 
 WORKDIR /
 
-CMD ["perl5.30.1","-de0"]
+CMD ["perl5.30.2","-de0"]
diff --git a/config.yml b/config.yml
index 67ef362..0bb09ff 100644
--- a/config.yml
+++ b/config.yml
@@ -69,8 +69,8 @@ releases:
       - stretch
       - buster
 
-  - version: 5.30.1
-    sha256:  7336cd3ed0535eb61b76a71350effcfa7c88b44faf37d64d70952ced5d38cd35
+  - version: 5.30.2
+    sha256:  a1aa88bd6fbbdc2e82938afbb76c408b0ea847317737b712dc196cc7907a5259
     type:    xz
     debian_release:
       - stretch