--- a/doc/make_doc
+++ b/doc/make_doc
@@ -13,15 +13,13 @@
 
 set -e
 
-[ -L GAPROOT ] || { echo GAPROOT link missing; exit 1; }
-
 echo "TeXing documentation"
 # TeX the manual
 tex manual
 # ... and build its bibliography (uncomment if there is a `manual.bib')
 bibtex manual
 # TeX the manual again to incorporate the ToC ... and build the index
-tex manual; GAPROOT/etc/manualindex manual
+tex manual; /usr/share/gap/etc/manualindex manual
 # Finally TeX the manual again to get cross-references right
 tex manual
 # Create the PostScript version (uncomment next line, if needed)
@@ -33,7 +31,8 @@
 rm -rf ../htm
 mkdir ../htm
 echo "Creating HTML documentation"
-GAPROOT/etc/convert.pl -t -c -n FGA . ../htm
+export GAP_CONVERT_DATE="March 2018"
+/usr/share/gap/etc/convert.pl -c -u -n FGA . ../htm
 
 #############################################################################
 ##
--- a/doc/manual.tex
+++ b/doc/manual.tex
@@ -7,7 +7,7 @@
 %%
 %F  gapmacro . . . . . . . . . . . . . . . . . read the GAP macro package
 %%
-\input GAPROOT/etc/gapmacro
+\input /usr/share/gap/etc/gapmacro
 \Package{FGA}
 %
 %
@@ -22,7 +22,7 @@
 %%
 %F  UseReferences . . . . . . . . . . . . . . . . . .  specify references
 %%
-\UseReferences{GAPROOT/doc/ref}
+\UseReferences{../../../doc/ref}
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -65,7 +65,7 @@
 %%
 \FrontMatter
 %
-\immediate\write\citeout{\bs bibdata{./manual,GAPROOT/doc/manualbib.xml.bib}}
+\immediate\write\citeout{\bs bibdata{./manual,/usr/share/gap/doc/manualbib.xml.bib}}
 %
 %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
