diff --git a/Changelog b/Changelog
index c5185f7eec1a3fd2568154ad2a080bae73edc925..1ec2d8c41acabaff4014564267c2a9d52204835a 100644
--- a/Changelog
+++ b/Changelog
@@ -14,6 +14,7 @@ version <next>:
 - Matroska 3D support thorugh side data
 - HTML generation using texi2html is deprecated in favor of makeinfo/texi2any
 - silenceremove filter
+- ffplay now exits by default at the end of playback
 
 
 version 2.3:
diff --git a/doc/ffplay.texi b/doc/ffplay.texi
index 203085c16d0f7fb0a742221ae0292fa8b825e040..4ce6ab3538f0469ad0b4fe4d33074ddf3e604bdc 100644
--- a/doc/ffplay.texi
+++ b/doc/ffplay.texi
@@ -142,8 +142,8 @@ Select the desired subtitle stream number, counting from 0. The number
 refers to the list of all the input subtitle streams. If it is greater
 than the number of subtitle streams minus one, then the last one is
 selected, if it is negative the subtitle rendering is disabled.
-@item -autoexit
-Exit when video is done playing.
+@item -noautoexit
+Do not exit after playback is finished.
 @item -exitonkeydown
 Exit if any key is pressed.
 @item -exitonmousedown