diff --git a/PackageInfo.g b/PackageInfo.g
index a0b5ea6..8b1eeef 100644
--- a/PackageInfo.g
+++ b/PackageInfo.g
@@ -5,11 +5,11 @@
 SetPackageInfo( rec(
 PackageName := "fr",
 Subtitle := "Computations with functionally recursive groups",
-Version := "2.3.5",
-Date := "13/03/2016",
+Version := "2.3.6",
+Date := "21/04/2016",
 ## <#GAPDoc Label="Version">
-## <!ENTITY Version "2.3.5">
-## <!ENTITY Date "13/03/2016">
+## <!ENTITY Version "2.3.6">
+## <!ENTITY Date "21/04/2016">
 ## <#/GAPDoc>
 
 Persons := [
diff --git a/doc/fr.xml b/doc/fr.xml
index eb31038..a50ec46 100644
--- a/doc/fr.xml
+++ b/doc/fr.xml
@@ -34,17 +34,14 @@
   <URL>http://gap-system.org</URL>.
   <P/>
   This documentation for <Package>FR</Package> is available at
-  <URL>http://laurentbartholdi.github.com/fr/manual.pdf</URL> in PDF
+  <URL>http://www.gap-system.org/Manuals/pkg/fr-&Version;/doc/manual.pdf</URL> in PDF
   format, and may be accessed online at
-  <URL>http://laurentbartholdi.github.com/fr/</URL>.
+  <URL>http://gap-packages.github.io/fr/</URL>.
   <P/>
   The latest release of the package may be downloaded as
-  <URL>https://github.com/laurentbartholdi/fr/archive/&Version;.tar.gz</URL> (tar, gzipped) and <URL>https://github.com/laurentbartholdi/fr/archive/&Version;.zip</URL> (zip). The latest repository version (possibly unstable) may be downloaded as <URL>https://github.com/laurentbartholdi/fr/tarball/master</URL> (tar, gzipped),
-  <URL>https://github.com/laurentbartholdi/fr.git</URL> (git repository), or
-  explored at <URL>https://github.com/laurentbartholdi/fr/tree/master/</URL>.
-  <P/>
-  The last source compatible with GAP 4.4.12 may be downloaded as
-  <URL>https://github.com/downloads/laurentbartholdi/fr/fr-1.1.2.tar.gz</URL> (tar, gzipped).
+  <URL>https://github.com/gap-packages/fr/archive/&Version;.tar.gz</URL> (tar, gzipped) and <URL>https://github.com/gap-packages/fr/archive/&Version;.zip</URL> (zip). The latest repository version (possibly unstable) may be downloaded as <URL>https://github.com/gap-packages/fr/tarball/master</URL> (tar, gzipped),
+  <URL>https://github.com/gap-packages/fr.git</URL> (git repository), or
+  explored at <URL>https://github.com/gap-packages/fr/tree/master/</URL>.
   </Alt>
   <P/>
     Groups defined by a recursive action on a rooted tree can