diff --git a/src/ChangeLog b/src/ChangeLog
index c9634c15e4..c6512a8bf9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-03-05  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* pch.h:
+	* support/pch.h:
+	* support/debugstream.h: Use the correct nullstream.
+
 2006-02-26  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
 	* text3.C (mathDispatch): fix math inset creation from string (bug 2315)
diff --git a/src/pch.h b/src/pch.h
index cac89198fa..b2c41405aa 100644
--- a/src/pch.h
+++ b/src/pch.h
@@ -17,7 +17,14 @@
 #include <boost/signals/connection.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103301
+# include <boost/test/detail/nullstream.hpp>
+#else
+# include <boost/test/utils/nullstream.hpp>
+#endif
+
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>
diff --git a/src/support/debugstream.h b/src/support/debugstream.h
index c41d4d94b1..47ab04aa8d 100644
--- a/src/support/debugstream.h
+++ b/src/support/debugstream.h
@@ -14,7 +14,13 @@
 
 #include <iostream>
 
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103301
+#  include <boost/test/detail/nullstream.hpp>
+#else
+#  include <boost/test/utils/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG
diff --git a/src/support/pch.h b/src/support/pch.h
index df68682721..6b2f9b7f64 100644
--- a/src/support/pch.h
+++ b/src/support/pch.h
@@ -10,7 +10,14 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
-#include <boost/test/detail/nullstream.hpp>
+#include <boost/version.hpp>
+
+#if BOOST_VERSION < 103301
+# include <boost/test/detail/nullstream.hpp>
+#else
+# include <boost/test/utils/nullstream.hpp>
+#endif
+
 #include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>