diff --git a/beetsplug/convert.py b/beetsplug/convert.py
index 2ea62cd22..90def8400 100644
--- a/beetsplug/convert.py
+++ b/beetsplug/convert.py
@@ -341,7 +341,7 @@ class ConvertPlugin(BeetsPlugin):
                               help='set the destination directory')
         cmd.parser.add_option('-f', '--format', action='store', dest='format',
                               help='set the destination directory')
-        cmd.parser.add_option('-y', '--yes', action='store', dest='yes',
+        cmd.parser.add_option('-y', '--yes', action='store_true', dest='yes',
                               help='do not ask for confirmation')
         cmd.func = convert_func
         return [cmd]
diff --git a/docs/changelog.rst b/docs/changelog.rst
index fca0edad3..817804742 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -10,6 +10,8 @@ Fixes:
   fails.
 * :doc:`/plugins/mpdstats`: Fix an error on start (introduced in the previous
   version). Thanks to Zach Denton.
+* :doc:`/plugins/convert`: The ``--yes`` command-line flag no longer expects
+  an argument.
 
 1.3.8 (September 17, 2014)
 --------------------------