diff -u -r ../crossrefware.orig/bbl2bib.pl ./texmf-dist/scripts/crossrefware/bbl2bib.pl
--- ../crossrefware.orig/bbl2bib.pl	2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bbl2bib.pl	2020-05-01 17:28:25.033071437 +0200
@@ -98,7 +98,7 @@
 use strict;
 BEGIN {
     # find files relative to our installed location within TeX Live
-    chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
     if (length($TLMaster)) {
 	unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
     }
diff -u -r ../crossrefware.orig/bibdoiadd.pl ./texmf-dist/scripts/crossrefware/bibdoiadd.pl
--- ../crossrefware.orig/bibdoiadd.pl	2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bibdoiadd.pl	2020-05-01 17:28:25.043071424 +0200
@@ -97,7 +97,7 @@
 use strict;
 BEGIN {
     # find files relative to our installed location within TeX Live
-    chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
     if (length($TLMaster)) {
 	unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
     }
diff -u -r ../crossrefware.orig/bibmradd.pl ./texmf-dist/scripts/crossrefware/bibmradd.pl
--- ../crossrefware.orig/bibmradd.pl	2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bibmradd.pl	2020-05-01 17:28:25.036404766 +0200
@@ -64,7 +64,7 @@
 use strict;
 BEGIN {
     # find files relative to our installed location within TeX Live
-    chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
     if (length($TLMaster)) {
 	unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
     }
diff -u -r ../crossrefware.orig/biburl2doi.pl ./texmf-dist/scripts/crossrefware/biburl2doi.pl
--- ../crossrefware.orig/biburl2doi.pl	2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/biburl2doi.pl	2020-05-01 17:28:25.039738095 +0200
@@ -51,7 +51,7 @@
 use strict;
 BEGIN {
     # find files relative to our installed location within TeX Live
-    chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
     if (length($TLMaster)) {
 	unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
     }
diff -u -r ../crossrefware.orig/bibzbladd.pl ./texmf-dist/scripts/crossrefware/bibzbladd.pl
--- ../crossrefware.orig/bibzbladd.pl	2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/bibzbladd.pl	2020-05-01 17:28:25.043071424 +0200
@@ -64,7 +64,7 @@
 use strict;
 BEGIN {
     # find files relative to our installed location within TeX Live
-    chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
     if (length($TLMaster)) {
 	unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
     }
diff -u -r ../crossrefware.orig/ltx2crossrefxml.pl ./texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl
--- ../crossrefware.orig/ltx2crossrefxml.pl	2020-05-01 17:25:50.416609028 +0200
+++ ./texmf-dist/scripts/crossrefware/ltx2crossrefxml.pl	2020-05-01 17:28:25.036404766 +0200
@@ -70,7 +70,7 @@
 
  BEGIN {
      # find files relative to our installed location within TeX Live
-     chomp(my $TLMaster = `kpsewhich -var-value=SELFAUTOPARENT`); # TL root
+     chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
      if (length($TLMaster)) {
 	 unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
      }
