diff --git a/boost/ChangeLog b/boost/ChangeLog
index 4bfc98d971..3b3ecb6fd4 100644
--- a/boost/ChangeLog
+++ b/boost/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-12  Angus Leeming  <leeming@lyx.org>
+
+	* boost/config/compiler/gcc.hpp allow to compile with gcc 4.0
+	without warnings.
+
 2004-11-03  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* boost/format/feed_args.hpp: do not use a static string (bug 1702)
diff --git a/boost/boost/config/compiler/gcc.hpp b/boost/boost/config/compiler/gcc.hpp
index aed95465c9..c516678e61 100644
--- a/boost/boost/config/compiler/gcc.hpp
+++ b/boost/boost/config/compiler/gcc.hpp
@@ -50,7 +50,7 @@
 #endif
 //
 // last known and checked version is 3.4:
-#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ > 0))
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else