diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 63c176b1c45..06c30f7a99a 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-02  Gabriel Dos Reis  <gdr@integrable-solutions.net>
+
+	* include/std/std_complex.h (log): Tidy.
+
 2004-05-31  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* config/linker-map.gnu (GLIBCXX_3.4.1): Add.
diff --git a/libstdc++-v3/include/std/std_complex.h b/libstdc++-v3/include/std/std_complex.h
index 097ce3b7f9f..d05f8fae253 100644
--- a/libstdc++-v3/include/std/std_complex.h
+++ b/libstdc++-v3/include/std/std_complex.h
@@ -732,11 +732,14 @@ namespace std
 
   inline __complex__ long double
   __complex_log(const __complex__ long double& __z)
-  { return __builtin_clog(__z); } */
+  { return __builtin_clogl(__z); } */
 
+  // FIXME: Currently wer don't use built-ins for log() because of some
+  //        obscure user name-space issues.  So, we use the generic version
+  //        which is why we don't use __z.__rep() in the call below.
   template<typename _Tp>
     inline complex<_Tp>
-    log(const complex<_Tp>& __z) { return __complex_log(__z.__rep()); }
+    log(const complex<_Tp>& __z) { return __complex_log(__z); }
 
   template<typename _Tp>
     inline complex<_Tp>