diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 020da6be870..dbf3a828d35 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-05  Benjamin Kosnik  <bkoz@cygnus.com>
+
+        * decl2.c: Make flag_honor_std dependant on ENABLE_STD_NAMESPACE.
+
 2000-04-05  Mark Mitchell  <mark@codesourcery.com>
 
 	* cp-tree.h (instantiate_decl): Change prototype.
diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c
index 982bd2d4606..3d421d5b207 100644
--- a/gcc/cp/decl2.c
+++ b/gcc/cp/decl2.c
@@ -452,7 +452,7 @@ int flag_use_cxa_atexit;
 
 /* Nonzero to not ignore namespace std. */
 
-int flag_honor_std;
+int flag_honor_std = ENABLE_STD_NAMESPACE;
 
 /* Nonzero if we should expand functions calls inline at the tree
    level, rather than at the RTL level.  */