diff --git a/CHANGES.current b/CHANGES.current
index 99dc51276..b1817048c 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -4,6 +4,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 
 Version 2.0.4 (in progress)
 ===========================
+2011-04-29: szager
+	    Fixed bug 2811549: return non-const iterators from STL
+	    methods begin(), end(), rbegin(), rend().
+
 2011-04-25: szager
 	    Fixed bug 1498929: Access to member fields in map elements
 
diff --git a/Lib/std/std_container.i b/Lib/std/std_container.i
index 66a9efa79..73d0c6ad9 100644
--- a/Lib/std/std_container.i
+++ b/Lib/std/std_container.i
@@ -26,10 +26,10 @@
   class const_iterator;
   class const_reverse_iterator;
 
-  const_iterator begin() const;
-  const_iterator end() const;
-  const_reverse_iterator rbegin() const;
-  const_reverse_iterator rend() const;
+  iterator begin();
+  iterator end();
+  reverse_iterator rbegin();
+  reverse_iterator rend();
   #endif
 
 %enddef