diff --git a/CHANGELOG b/CHANGELOG
index 9f1b2c86ca5b..7bd5be75db61 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,6 +3,9 @@
 2014-04-27 Improved input clean up in Axes.{h|v}lines
            Coerce input into a 1D ndarrays (after dealing with units).
 
+2014-04-22 Added (re-)generate a simple automatic legend to "Figure Options"
+           dialog of the Qt4Agg backend.
+           
 2014-04-22 Added an example showing the difference between
            interpolation = 'none' and interpolation = 'nearest' in
            `imshow()` when saving vector graphics files.
diff --git a/doc/users/whats_new.rst b/doc/users/whats_new.rst
index 3b46a2f8376d..33e33f0b7ace 100644
--- a/doc/users/whats_new.rst
+++ b/doc/users/whats_new.rst
@@ -226,6 +226,10 @@ added. Furthermore, the the subplottool is now implemented as a modal
 dialog. It was previously a QMainWindow, leaving the SPT open if one closed the
 plotwindow.
 
+In the figureoptions dialog one can now choose to (re-)generate a simple 
+automatic legend. Any fancyness of a customized legend will be lost. But changes
+to the curves' label, linestyle, et cetera will now be updated in the legend.
+
 Interactive performance of the Qt4 backend has been dramatically improved
 under windows.