diff --git a/doc/latex/global/latexmk.pl b/doc/latex/global/latexmk.pl
index 62cbcc672c76233c87b6a8666af49eda89c16058..266016dd27c763052c2bcd964a85aa02b461ad85 100644
--- a/doc/latex/global/latexmk.pl
+++ b/doc/latex/global/latexmk.pl
@@ -10,7 +10,7 @@ $out_dir            = '../build';
 ## Custom cmds
 set_tex_cmds('-shell-escape -file-line-error -interaction=nonstopmode');
 #set_tex_cmds('-shell-escape -file-line-error');
-$makeindex = 'makeindex %O -s %R.ist -o %D %S';
+$makeindex = "makeindex %O -s ../../global/index.ist -o $out_dir/%D $out_dir/%S";
 ## %D: Destination file (.ind for index)
 ## %O: Options
 ## %R: Root filename (${model}_manual)
diff --git a/doc/latex/global/packages.tex b/doc/latex/global/packages.tex
index 557557e3b0ab32e1049118da8d3b6336d2c94c89..11508d5edb96aa667158f192d02be92a9e66e1be 100644
--- a/doc/latex/global/packages.tex
+++ b/doc/latex/global/packages.tex
@@ -14,7 +14,7 @@
 %% Fonts
 \usepackage{fontspec}
 %% Issue with path to 'FontAwesome.otf'
-\defaultfontfeatures{Path=/usr/local/texlive/2020/texmf-dist/fonts/opentype/public/fontawesome/}
+\defaultfontfeatures{Path=/usr/local/texlive/2021/texmf-dist/fonts/opentype/public/fontawesome/}
 \usepackage{academicons,fontawesome}
 
 %% Formatting