diff --git a/docs/changelog.rst b/docs/changelog.rst
index d76eeeb69..b7d554504 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -18,6 +18,8 @@ Features:
   in its album-level incarnation, it could not represent heterogeneous
   releases---for example, an album consisting of a CD and a DVD. Now, tracks
   accurately indicate the media they appear on. Thanks to Heinz Wiesinger.
+* :doc:`/plugins/embedart`: A new ``ifempty`` config option lets you only
+  embed album art when no album art is present. Thanks to kerobaros.
 
 Fixes:
 
diff --git a/docs/plugins/embedart.rst b/docs/plugins/embedart.rst
index 5abc24a04..387d6a3ff 100644
--- a/docs/plugins/embedart.rst
+++ b/docs/plugins/embedart.rst
@@ -28,7 +28,7 @@ When importing a lot of files with the ``auto`` option, one may be reluctant to
 overwrite existing embedded art for all of them.
 
 You can tell beets to avoid embedding images that are too different from the
-existing ones. 
+existing ones.
 This works by computing the perceptual hashes (`PHASH`_) of the two images and
 checking that the difference between the two does not exceed a
 threshold. You can set the threshold with the ``compare_threshold`` option.
@@ -81,6 +81,9 @@ regarding to embedded art to be written to the file (see
 :ref:`image-similarity-check`). The default is 0 (no similarity check).
 Requires `ImageMagick`_.
 
+To avoid embedding album art for files that already have album art, set the
+``ifempty`` config option to ``yes``.
+
 .. _PIL: http://www.pythonware.com/products/pil/
 .. _ImageMagick: http://www.imagemagick.org/
 .. _PHASH: http://www.fmwconcepts.com/misc_tests/perceptual_hash_test_results_510/
diff --git a/docs/plugins/fetchart.rst b/docs/plugins/fetchart.rst
index 37d1b9056..1aa171dac 100644
--- a/docs/plugins/fetchart.rst
+++ b/docs/plugins/fetchart.rst
@@ -111,7 +111,6 @@ your config file::
 
     fetchart:
         google_search: true
-        
 
 Embedding Album Art
 -------------------