diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c02ac6ff9b637cf897bdb739695d8b514aeb8b83..39f58d4db595c4649c741963085346a6aec1af5b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-21  Benjamin Kosnik  <bkoz@redhat.com>
+
+	* include/c_std/cmath.tcc: Use _GLIBCXX_BEGIN_NAMESPACE,
+	_GLIBCXX_END_NAMESPACE.
+
 2006-02-21  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/bits/c++config: Simplify debug namespaces.
diff --git a/libstdc++-v3/include/c_std/cmath.tcc b/libstdc++-v3/include/c_std/cmath.tcc
index 737b58c7de921481ca32ddfc7fb91e050f31ca37..b2df1be0bd1509d326bff8f0ca66d9b46ba9a885 100644
--- a/libstdc++-v3/include/c_std/cmath.tcc
+++ b/libstdc++-v3/include/c_std/cmath.tcc
@@ -1,6 +1,6 @@
 // -*- C++ -*- C math library.
 
-// Copyright (C) 2000, 2003, 2004 Free Software Foundation, Inc.
+// Copyright (C) 2000, 2003, 2004, 2006 Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // software; you can redistribute it and/or modify it under the
@@ -32,8 +32,8 @@
 #ifndef _GLIBCXX_CMATH_TCC
 #define _GLIBCXX_CMATH_TCC 1
 
-namespace std
-{
+_GLIBCXX_BEGIN_NAMESPACE(std)
+
   template<typename _Tp>
     inline _Tp
     __cmath_power(_Tp __x, unsigned int __n)
@@ -49,6 +49,7 @@ namespace std
 
       return __y;
     }
-}
+
+_GLIBCXX_END_NAMESPACE
 
 #endif