diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1031465d422b4108c4ff8b60b3b6ba98a8c6e129..21e5347a9b6fb2264846ab8d117124c4135bd3c6 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-03  Paolo Carlini  <pcarlini@suse.de>
+
+	PR libstdc++/29989
+	* include/bits/stl_algobase.h: Remove min and max #undefs.
+
 2006-12-02  Howard Hinnant  <hhinnant@apple.com>
 
 	* acinclude.m4: Allow OPTIMIZE_CXXFLAGS to be set by configure.host.
diff --git a/libstdc++-v3/include/bits/stl_algobase.h b/libstdc++-v3/include/bits/stl_algobase.h
index 2c603ebcc702bbda5499700be9074161fbae0746..4623c615f8e4072c3c7854b4b37cde4579c48250 100644
--- a/libstdc++-v3/include/bits/stl_algobase.h
+++ b/libstdc++-v3/include/bits/stl_algobase.h
@@ -167,9 +167,6 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
 	iter_swap(__a, __b);
     }
 
-#undef min
-#undef max
-
   /**
    *  @brief This does what you think it does.
    *  @param  a  A thing of arbitrary type.