diff --git a/ChangeLog b/ChangeLog
index 8de3819b99..7c73852d8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1999-12-14  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+	* src/buffer.C (makeDocBookFile): update version number in output
+	file. 
+	(SimpleDocBookOnePar): fix an assert when trying to a character
+	access beyond string length
+	[Patch from Jose']
+
 1999-12-13  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
 	* po/de.po: fix the Export menu
diff --git a/src/buffer.C b/src/buffer.C
index 76258303f8..ff14fadc61 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -2790,7 +2790,7 @@ void Buffer::makeDocBookFile(string const & filename, int column)
 		ofs << "\n [ " << params.preamble << " \n]>\n\n";
 
         string userName(getUserName());
-	ofs << "<!-- DocBook file was created by LyX 1.0 (C) 1995-1999\n"
+	ofs << "<!-- DocBook file was created by LyX 1.1 (C) 1995-1999\n"
 	    << "by <" << userName << "> " << date() << " -->\n";
 
 	if(params.options.empty())
@@ -3107,7 +3107,7 @@ void Buffer::SimpleDocBookOnePar(string & file, string & extra,
 			//         desc_on == 4
 			//
 			if(desc_on!= 3 || i!= 0) {
-				if(tmp_out[0] == '@') {
+				if(!tmp_out.empty() && tmp_out[0] == '@') {
 					if(desc_on == 4)
 						extra += frontStrip(tmp_out, '@');
 					else