diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8ad8cc60fd..3d4a915e57 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-16  José Matos  <jamatos@fep.up.pt>
+
+	* layouts/db_stdlayouts.inc: Fix name for caption.
+
 2002-01-15  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* examples/mathed.lyx: a bit of a clean-up. Corrected the contents
diff --git a/lib/layouts/db_stdlayouts.inc b/lib/layouts/db_stdlayouts.inc
index fc3a14d608..55626bed41 100644
--- a/lib/layouts/db_stdlayouts.inc
+++ b/lib/layouts/db_stdlayouts.inc
@@ -44,5 +44,5 @@ NoStyle Verse
 
 Style Caption
   LatexType		Paragraph
-  LatexName		caption
+  LatexName		title
 End
\ No newline at end of file
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 3ecc8d6425..20d4e8fca1 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-16  José Matos  <jamatos@fep.up.pt>
+
+	* figinset.C (docbook): removed a old place holder "@".
+	* insetgraphics.C (docbook): remove the file sufix if graphic is eps.
+	* insetinclude.C (linuxdoc): if include is verbatim, then export the
+	ascii text version, clearly guarded inside a CDATA section.
+	(docbook): in docbook 4, inlinegraphics is empty.
+	* insettabular.C (linuxdoc): export the ascii version of the table
+	inside a CDATA section.
+
 2002-01-14  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* insetparent.C (InsetParent): 
diff --git a/src/insets/figinset.C b/src/insets/figinset.C
index e961aec776..4737f6e739 100644
--- a/src/insets/figinset.C
+++ b/src/insets/figinset.C
@@ -1188,7 +1188,7 @@ int InsetFig::docbook(Buffer const *, ostream & os) const
 	if (suffixIs(figurename, ".eps"))
 		figurename.erase(figurename.length() - 4);
 
-	os << "@<graphic fileref=\"" << figurename << "\"></graphic>";
+	os << "<graphic fileref=\"" << figurename << "\"></graphic>";
 	return 0;
 } 
 
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index b2b1e46e9f..4e19504f5a 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -773,8 +773,11 @@ int InsetGraphics::docbook(Buffer const * buf, ostream & os) const
 {
 	// Change the path to be relative to the main file.
 	string const buffer_dir = buf->filePath();
-	string const filename = RemoveExtension(
-	                           MakeRelPath(params.filename, buffer_dir));
+	string filename = RemoveExtension(
+		MakeRelPath(params.filename, buffer_dir));
+
+	if (suffixIs(filename, ".eps"))
+		filename.erase(filename.length() - 4);
 
 	// In DocBook v5.0, the graphic tag will be eliminated from DocBook, will 
 	// need to switch to MediaObject. However, for now this is sufficient and 
diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index e4f207a1a5..20bca653ca 100644
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -332,9 +332,9 @@ int InsetInclude::linuxdoc(Buffer const * buffer, ostream & os) const
 	}
 
 	if (isVerbatim()) {
-		os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
-		   << "\" format=\"linespecific\">"
-		   << "</inlinegraphic>";
+		os << "<![CDATA["
+		   << GetFileContents(getFileName())
+		   << "]]>";
 	} else
 		os << '&' << include_label << ';';
 	
@@ -370,9 +370,9 @@ int InsetInclude::docbook(Buffer const * buffer, ostream & os) const
 	}
 
 	if (isVerbatim()) {
-		os << "<inlinegraphic fileref=\"" << '&' << include_label << ';'
+		os << "<inlinegraphic fileref=\""
+		   << '&' << include_label << ';'
 		   << "\" format=\"linespecific\">"
-		   << "</inlinegraphic>";
 	} else
 		os << '&' << include_label << ';';
 	
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 222ae6dc8a..1f53d1dd96 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1226,7 +1226,12 @@ int InsetTabular::ascii(Buffer const * buf, ostream & os, int ll) const
 
 int InsetTabular::linuxdoc(Buffer const * buf, ostream & os) const
 {
-	return tabular->ascii(buf,os, (int)parOwner()->params().depth(), false, 0);
+	os << "<![CDATA[";
+	int const ret = tabular->ascii(buf,os,
+				       (int)parOwner()->params().depth(),
+				       false, 0);
+	os << "]]>";
+	return ret;
 }