diff --git a/PackageInfo.g b/PackageInfo.g
index 46f5058..dab97f7 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -8,10 +8,6 @@ Subtitle := "Integration of mpfr, mpfi, mpc, fplll and cxsc in GAP",
 Version := "1.0.9",
 Date := "26/08/2025", # dd/mm/yyyy format
 License := "GPL-2.0-or-later",
-## <#GAPDoc Label="Version">
-## <!ENTITY Version "1.0.9">
-## <!ENTITY Date "26/08/2025">
-## <#/GAPDoc>
 Persons := [
   rec( 
     LastName      := "Bartholdi",
@@ -109,5 +105,15 @@ BannerFunction := function(info)
 end,
 
 TestFile := "tst/testall.g",
-Keywords := ["floating-point"]
+Keywords := ["floating-point"],
+
+AutoDoc := rec(
+    entities := rec(
+        Version := ~.Version,
+        Date := ~.Date,
+    ),
+    MainPage := false,
+    TitlePage := false,
+),
+
 ));
diff --git a/doc/float.xml b/doc/float.xml
index a267df2..2621981 100644
--- a/doc/float.xml
+++ b/doc/float.xml
@@ -2,7 +2,7 @@
 
 <!DOCTYPE Book SYSTEM "gapdoc.dtd" [
  <!ENTITY see '<Alt Only="LaTeX">$\to$</Alt><Alt Not="LaTeX">--&tgt;</Alt>'>
- <#Include Label="Version">
+ <#Include SYSTEM "_entities.xml">
 ]>
 <Book Name="FLOAT">
 
diff --git a/makedoc.g b/makedoc.g
index e92d1ad..7b5c5fb 100644
--- a/makedoc.g
+++ b/makedoc.g
@@ -1,11 +1,9 @@
-#if fail = LoadPackage("AutoDoc", ">= 2016.01.21") then
-#    Error("AutoDoc 2016.01.21 or newer is required");
-#fi;
-#AutoDoc(rec(gapdoc := rec(files:=["PackageInfo.g"])));
-
-MakeGAPDocDoc("doc","float",
-            ["../lib/float.gd","../lib/pslq.gi","../PackageInfo.g"],"float","MathJax");
-CopyHTMLStyleFiles("doc");
-GAPDocManualLab("Float");
-
-QUIT;
+if fail = LoadPackage("AutoDoc", ">= 2022.07.10") then
+    Error("AutoDoc 2022.07.10 or newer is required");
+fi;
+AutoDoc(rec(
+    gapdoc := rec(
+        main:="float.xml",
+        LaTeXOptions := rec( InputEncoding := "latin1" ),
+    )
+));