diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f9f5295140..d53abe9b7f 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-27  José Matos  <jamatos@fep.up.pt>
+
+	* insetnote.h (linuxdoc,docbook): update support.
+
 2003-07-27  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* insetfloat.C (wide): add a space to label, for consistency
diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index b08dc90612..d8acb2a3e3 100644
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -169,19 +169,40 @@ int InsetNote::latex(Buffer const * buf, ostream & os,
 }
 
 
-int InsetNote::linuxdoc(Buffer const *, std::ostream &) const
+int InsetNote::linuxdoc(Buffer const * buf, std::ostream & os) const
 {
-	return 0;
+	string const pt = params_.type;
+
+	int i = 0;
+	if (pt == "Comment")
+		os << "<comment>\n";
+
+	if (pt != "Note")
+		i = inset.linuxdoc(buf, os);
+
+	if (pt == "Comment") {
+		os << "\n</comment>\n";
+		i += 3;
+	}
+	return i;
 }
 
 
 int InsetNote::docbook(Buffer const * buf, std::ostream & os, bool mixcont) const
 {
-	int i = 0;
 	string const pt = params_.type;
-	// incomplete, untested - MV
+
+	int i = 0;
+	if (pt == "Comment")
+		os << "<remark>\n";
+
 	if (pt != "Note")
 		i = inset.docbook(buf, os, mixcont);
+
+	if (pt == "Comment") {
+		os << "\n</remark>\n";
+		i += 3;
+	}
 	return i;
 }