diff --git a/fr_FR.ISO8859-1/share/sgml/books.ent b/fr_FR.ISO8859-1/share/sgml/books.ent
index 91c0a4b1f1..822408483c 100644
--- a/fr_FR.ISO8859-1/share/sgml/books.ent
+++ b/fr_FR.ISO8859-1/share/sgml/books.ent
@@ -1,40 +1,40 @@
 <!-- $FreeBSD$
   Original revision: 1.2
 -->
 
 <!ENTITY % l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
 %l10n;
 <!ENTITY % l10n-common PUBLIC "-//FreeBSD//ENTITIES DocBook Language Neutral Entities//EN">
 %l10n-common;
 <!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR">
 %bookinfo;
 <!ENTITY % translators PUBLIC "-//FreeBSD//ENTITIES DocBook Translator Entities//FR">
 %translators;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR">
 %mailing-lists;
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR">
 %teams;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR">
 %newsgroups;
 <!ENTITY % man PUBLIC "-//FreeBSD//ENTITIES DocBook Manual Page Entities//EN">
 %man;
 <!ENTITY % bookinfo PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//EN">
 %bookinfo;
-<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//FR">
+<!ENTITY % freebsd PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//EN">
 %freebsd;
 <!ENTITY % authors PUBLIC "-//FreeBSD//ENTITIES DocBook Author Entities//EN">
 %authors;
 <!--
 <!ENTITY % teams PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//EN">
 %teams;
 <!ENTITY % mailing-lists PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//EN">
 %mailing-lists;
 <!ENTITY % newsgroups PUBLIC "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//EN">
 %newsgroups;
 -->
 <!ENTITY % trademarks PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//EN">
 %trademarks;
 <!ENTITY % urls PUBLIC "-//FreeBSD//ENTITIES DocBook URL Entities//EN">
 %urls;
 
 
diff --git a/fr_FR.ISO8859-1/share/sgml/catalog b/fr_FR.ISO8859-1/share/sgml/catalog
index 1a15c1fb52..f8ce5fe6e5 100644
--- a/fr_FR.ISO8859-1/share/sgml/catalog
+++ b/fr_FR.ISO8859-1/share/sgml/catalog
@@ -1,56 +1,52 @@
   -- ...................................................................... --
   -- FreeBSD SGML Public Identifiers ...................................... --
 
   -- ...................................................................... --
   -- French specific ...................................................... --
  
   -- $FreeBSD$
   --
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
 	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//FR" 
        "books.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
 	"mailing-lists.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
         "newsgroups.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
 	"teams.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//FR"
         "bookinfo.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES Common Document URL Entities//FR"
         "urls.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Translator Entities//FR"
         "translators.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Abstract Entities//FR"
         "abstract.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook ArtHeader Entities//FR"
         "artheader.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Mailing List Entities//FR"
         "mailing-lists.ent"
 
 PUBLIC  "-//FreeBSD//ENTITIES DocBook Newsgroup Entities//FR"
         "newsgroups.ent"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Team Entities//FR"
         "teams.ent"
 PUBLIC "-//FreeBSD//ENTITIES DocBook Trademark Entities//FR"
         "trademarks.ent"
-
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//FR"
-        "freebsd.ent"
-
diff --git a/fr_FR.ISO8859-1/share/sgml/freebsd.ent b/fr_FR.ISO8859-1/share/sgml/freebsd.ent
deleted file mode 100644
index e9f5522f63..0000000000
--- a/fr_FR.ISO8859-1/share/sgml/freebsd.ent
+++ /dev/null
@@ -1,74 +0,0 @@
-<!-- -*- sgml -*-
-    The FreeBSD Documentation Project
-    The FreeBSD French Documentation Project
-
-     DocBook Miscellaneous FreeBSD Entities.
-
-     $FreeBSD$
-     Original revision: 1.90
-
-This file is now valid XML as well as SGML.  Please do not add CDATA
-attributes or anything else that will prevent this file from being
-used in both environments.
-
--->
-
-<!-- These will almost certainly remain the same, but are here for
-     consistency and in case we ever want to make hyperlinks out of
-     some of them. -->
-<!ENTITY os "FreeBSD">
-<!ENTITY os.current "&os;-CURRENT">
-<!ENTITY os.stable "&os;-STABLE">
-
-<!--
-  Use this entity when referring to 'UNIX' in your document.
--->
-<!ENTITY unix "<trademark class='registered'>UNIX</trademark>">
-<!ENTITY nis "<acronym role='Network Information System'>NIS</acronym>">
-
-<!-- Use an entity to define these exactly so that the print output
-     stylesheets know what to look for and can format these properly with
-     TeX commands. -->
-
-<!ENTITY tex '<application>TeX</application>'>
-<!ENTITY latex '<application>LaTeX</application>'>
-
-<!-- Use an entity for the X.Org X server -->
-
-<!ENTITY xorg "Xorg">
-<!ENTITY xorg.version "6.9.0">
-
-<!-- The currently released version of FreeBSD.  This value is used to
-     create some links on web sites and such, so do NOT change it until
-     it's really release time -->
-<!ENTITY rel.current "6.1">
-<!ENTITY rel.current.date "Mai 2006">
-<!ENTITY rel.current.notes 'http://www.FreeBSD.org/releases/&rel.current;R/notes.html'>
-<!ENTITY rel.current.hardware 'http://www.FreeBSD.org/releases/&rel.current;R/hardware.html'>
-<!ENTITY rel.current.errata 'http://www.FreeBSD.org/releases/&rel.current;R/errata.html'>
-
-<!-- Entities for multiple "latest" versions of FreeBSD -->
-<!ENTITY rel2.current "5.5">
-<!ENTITY rel2.current.date "Mai 2006">
-<!ENTITY rel2.current.notes 'http://www.FreeBSD.org/releases/&rel2.current;R/notes.html'>
-<!ENTITY rel2.current.hardware 'http://www.FreeBSD.org/releases/&rel2.current;R/hardware.html'>
-<!ENTITY rel2.current.errata 'http://www.FreeBSD.org/releases/&rel2.current;R/errata.html'>
-
-<!-- Entities for the snapshots -->
-<!ENTITY snapshots.stable
-  'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/4-LATEST'>
-<!ENTITY snapshots.current
-  'ftp://snapshots.jp.freebsd.org/pub/FreeBSD/snapshots/i386/5-LATEST'>
-
-<!-- Sections that we don't want to be published -->
-<!ENTITY % not.published 	"IGNORE">
-
-<!-- Number of ports in the ports tree -->
-<!ENTITY os.numports "16,000">
-<!ENTITY ports.size "440&nbsp;Mo">
-
-<!-- GUI-buttons -->
-<!ENTITY gui.ok "<guibutton>[&nbsp;OK&nbsp;]</guibutton>">
-<!ENTITY gui.cancel "<guibutton>[&nbsp;Cancel&nbsp;]</guibutton>">
-<!ENTITY gui.yes "<guibutton>[&nbsp;Yes&nbsp;]</guibutton>">
-<!ENTITY gui.no "<guibutton>[&nbsp;No&nbsp;]</guibutton>">
diff --git a/fr_FR.ISO8859-1/share/sgml/l10n.ent b/fr_FR.ISO8859-1/share/sgml/l10n.ent
index cbc13ca432..e7dd9f8454 100644
--- a/fr_FR.ISO8859-1/share/sgml/l10n.ent
+++ b/fr_FR.ISO8859-1/share/sgml/l10n.ent
@@ -1,11 +1,15 @@
 <!-- -*- sgml -*-
      Entités DocBook spécifiques à la localisation (fr).
 
      $FreeBSD$
-     $Id: l10n.ent,v 1.1 2003-07-16 15:23:38 blackend Exp $
+     $Id: l10n.ent,v 1.2 2007-01-29 20:22:08 blackend Exp $
      Original revision: 1.1
 -->
 
 <!-- docformat navi -->
 <!ENTITY docnavi.single-html "Page HTML unique">
 <!ENTITY docnavi.split-html  "Multiples pages HTML">
+
+<!ENTITY rel.current.date "Janvier 2007">
+<!ENTITY rel2.current.date "Mai 2006">
+<!ENTITY ports.size "440&nbsp;Mo">