diff --git a/src/ChangeLog b/src/ChangeLog
index f556af6fa6..00fe0ab2ed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-25  Lars Gullik Bjønnes  <larsbj@gullik.net>
 
+	* lyx_cb.C (start): boost.formatify
+	do not include <iostream>
+
+	* lengthcommon.C: ws only
+
 	* boost-inst.C,BoostFormat.h: add more explict instantations
 
 2002-11-24  Lars Gullik Bjønnes  <larsbj@gullik.net>
diff --git a/src/lengthcommon.C b/src/lengthcommon.C
index 071cda6e44..dfabab4e7d 100644
--- a/src/lengthcommon.C
+++ b/src/lengthcommon.C
@@ -10,40 +10,40 @@ int const num_units = LyXLength::UNIT_NONE;
 // I am not sure if "mu" should be possible to select (Lgb)
 
 // unit_name is for compatibility. Can be deleted when all works well.
-// means, when we have full language support for the lengths 
-// in all gui's 				(Herbert 2002-11-01)
-char const * unit_name[num_units] = { 
-	"sp", "pt", "bp", "dd", "mm", "pc", 
-	"cc", "cm", "in", "ex", "em", "mu", 
+// means, when we have full language support for the lengths
+// in all gui's				(Herbert 2002-11-01)
+char const * unit_name[num_units] = {
+	"sp", "pt", "bp", "dd", "mm", "pc",
+	"cc", "cm", "in", "ex", "em", "mu",
 	"text%",  "col%", "page%", "line%",
- 	"theight%", "pheight%" };
+	"theight%", "pheight%" };
 
 // the latex units
-char const * unit_name_ltx[num_units] = { 
-	"sp", "pt", "bp", "dd", "mm", "pc", 
-	"cc", "cm", "in", "ex", "em", "mu", 
+char const * unit_name_ltx[num_units] = {
+	"sp", "pt", "bp", "dd", "mm", "pc",
+	"cc", "cm", "in", "ex", "em", "mu",
 	// in 1.4 the following names should be used. then no
 	// translation into the latex ones are needed
 //	"textheight",  "columnwidth", "pagewidth", "linewidth",
-// 	"textheight", "pageheight" };
+//	"textheight", "pageheight" };
 	"text%",  "col%", "page%", "line%",
- 	"theight%", "pheight%" };
+	"theight%", "pheight%" };
 
 // the LyX gui units
-char const * unit_name_gui[num_units] = { 
-	N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"), 
-	N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"), 
+char const * unit_name_gui[num_units] = {
+	N_("sp"), N_("pt"), N_("bp"), N_("dd"), N_("mm"), N_("pc"),
+	N_("cc"), N_("cm"), N_("in"), N_("ex"), N_("em"), N_("mu"),
 	N_("text%"), N_("col%"), N_("page%"), N_("line%"),
- 	N_("theight%"), N_("pheight%") };
+	N_("theight%"), N_("pheight%") };
 
 	// this one maybe better ???? but there can be problems with
 	// xforms (Herbert)
 //	N_("textwidth%"), N_("columnwidth%"), N_("pagewidth%"), N_("linewidth%"),
-// 	N_("textheight%"), N_("pageheight%") };
+//	N_("textheight%"), N_("pageheight%") };
 
 	// or altenative this ones
 //	N_("twidth%"), N_("cwidth%"), N_("pwidth%"), N_("lwidth%"),
-// 	N_("theight%"), N_("pheight%") };
+//	N_("theight%"), N_("pheight%") };
 
 LyXLength::UNIT unitFromString(string const & data)
 {
@@ -52,4 +52,3 @@ LyXLength::UNIT unitFromString(string const & data)
 		++i;
 	return static_cast<LyXLength::UNIT>(i);
 }
-
diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 3e41b36bff..354f54ca31 100644
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -36,10 +36,11 @@
 #include "support/systemcall.h"
 #include "support/lstrings.h"
 
+#include "BoostFormat.h"
+
 #include <fstream>
 #include <algorithm>
 #include <utility>
-#include <iostream>
 
 using std::vector;
 using std::ifstream;
@@ -268,8 +269,11 @@ private:
 
 int AutoSaveBuffer::start()
 {
-	command_ = _("Auto-saving $$f");
-	command_ = subst(command_, "$$f", fname_);
+#if USE_BOOST_FORMAT
+	command_ = boost::io::str(boost::format(_("Auto-saving %1$s")) % fname_);
+#else
+	command_ = _("Auto-saving ") + fname_;
+#endif
 	return runNonBlocking();
 }
 
@@ -317,7 +321,7 @@ int AutoSaveBuffer::generateChild()
 	}
 	return pid;
 }
- 
+
 } // namespace anon
 
 
@@ -344,7 +348,7 @@ void AutoSave(BufferView * bv)
 
 	AutoSaveBuffer autosave(*bv, fname);
 	autosave.start();
-	
+
 	bv->buffer()->markBakClean();
 	bv->owner()->resetAutosaveTimer();
 }