diff --git a/pandora_doc/ChangeLog b/pandora_doc/ChangeLog
index a5d671c63c..c40fe0102e 100644
--- a/pandora_doc/ChangeLog
+++ b/pandora_doc/ChangeLog
@@ -3,6 +3,8 @@
 	* Updated pandora_chapter 3 to 9.
 	
 	* Updated pandora.xml
+	
+	* Updated fdl.xml & gpl.xml
 
 2006-09-11  Sancho Lerena  <slerena@artica.es>
 
diff --git a/pandora_doc/fdl.xml b/pandora_doc/fdl.xml
index df7961d9ed..211fd2720d 100644
--- a/pandora_doc/fdl.xml
+++ b/pandora_doc/fdl.xml
@@ -1,12 +1,4 @@
-<!--  
-     The GNU Free Documentation License 1.1 in DocBook
-     Markup by Eric Baudais <baudais@okstate.edu>
-     Maintained by the GNOME Documentation Project
-     http://developer.gnome.org/projects/gdp
-     Version: 1.0.1
-     Last Modified: Nov 16, 2000
--->
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='utf-8'?>
 <appendix id="fdl">
   <appendixinfo>
     <releaseinfo>
@@ -627,7 +619,7 @@
     
     <blockquote>
       <para>
-	Copyright &copy; YEAR YOUR NAME.
+		Copyright &copy; YEAR YOUR NAME.
       </para>
       <para>
 	Permission is granted to copy, distribute and/or modify this
diff --git a/pandora_doc/gpl.xml b/pandora_doc/gpl.xml
index c8275201f1..9652ab21c0 100644
--- a/pandora_doc/gpl.xml
+++ b/pandora_doc/gpl.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='ISO-8859-1'?>
+<?xml version='1.0' encoding='utf-8'?>
 <appendix id="gpl">
   <appendixinfo>
     <title>GNU General Public License</title>
diff --git a/pandora_doc/pandora.xml b/pandora_doc/pandora.xml
index aedeae7981..540a99ce37 100644
--- a/pandora_doc/pandora.xml
+++ b/pandora_doc/pandora.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.4//EN"
-	  "docbookx.dtd" [
+	  "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [
 <!ENTITY pandora_version "v1.2">
 <!ENTITY pandora "<emphasis>Pandora</emphasis>">
 <!ENTITY include_pandora_chapter1 SYSTEM "pandora_chapter1.xml">
@@ -12,6 +12,8 @@
 <!ENTITY include_pandora_chapter7 SYSTEM "pandora_chapter7.xml">
 <!ENTITY include_pandora_chapter8 SYSTEM "pandora_chapter8.xml">
 <!ENTITY include_pandora_chapter9 SYSTEM "pandora_chapter9.xml">
+<!ENTITY include_fdl SYSTEM "fdl.xml">
+<!ENTITY include_gpl SYSTEM "gpl.xml">
 ]>
 
 <book lang="en">
@@ -65,5 +67,7 @@
   &include_pandora_chapter7;
   &include_pandora_chapter8; 
   &include_pandora_chapter9;
-  
+  &include_fdl;
+  &include_gpl;
+    
 </book>
\ No newline at end of file
diff --git a/pandora_doc/pandora_chapter3.xml b/pandora_doc/pandora_chapter3.xml
index 7dd9f9a6e8..f5548dc7ec 100644
--- a/pandora_doc/pandora_chapter3.xml
+++ b/pandora_doc/pandora_chapter3.xml
@@ -561,7 +561,7 @@
 	<para><emphasis>Module name:</emphasis> Name given to the module
 	in the agent's config file.</para>
 	<para><emphasis>Module type:</emphasis> Type of module as described
-	in <link linkend="#321">section 3.2.1</link>.</para>
+	in Asigning Modules section.</para>
 	<para><emphasis>Description:</emphasis> Description given to the module
 	in the agent's config file.</para>
 	<para><emphasis>Data:</emphasis> Last data sent by the agent.</para>