--- runfiles/texmf-dist/scripts/crossrefware/bibdoiadd.pl.orig
+++ runfiles/texmf-dist/scripts/crossrefware/bibdoiadd.pl
@@ -106,10 +106,7 @@
 
 BEGIN {
     # find files relative to our installed location within TeX Live
-    chomp(my $TLMaster = `kpsewhich -var-value=TEXMFROOT`); # TL root
-    if (length($TLMaster)) {
-	unshift @INC, "$TLMaster/texmf-dist/scripts/bibtexperllibs";
-    }
+    unshift @INC, "@@TEXMFDIST@@/scripts/bibtexperllibs";
 }
 
 use BibTeX::Parser;