diff --git a/beetsplug/smartplaylist.py b/beetsplug/smartplaylist.py
index dae5561fb..195f94632 100644
--- a/beetsplug/smartplaylist.py
+++ b/beetsplug/smartplaylist.py
@@ -96,6 +96,7 @@ class SmartPlaylistPlugin(BeetsPlugin):
         self.config.add({
             'relative_to': None,
             'playlist_dir': u'.',
+            'auto': True,
             'playlists': []
         })
 
@@ -116,5 +117,6 @@ def handle_change(lib):
 
 @SmartPlaylistPlugin.listen('cli_exit')
 def update(lib):
-    if database_changed:
+    auto = config['smartplaylist']['auto']
+    if database_changed and auto:
         update_playlists(lib)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1b6321484..ec8fb3759 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -21,7 +21,8 @@ New stuff:
   johtso.
 * :doc:`/plugins/smartplaylist`: Playlists can now be generated from multiple
   queries (combined with "or" logic). Album-level queries are also now
-  possible. Thanks to brilnius.
+  possible. Automatic playlist regeneration can now be disabled. Thanks to
+  brilnius.
 * :doc:`/plugins/echonest`: Echo Nest similarity now weights the tempo in
   better proportion to other metrics. Also, options were added to specify
   custom thresholds and output formats. Thanks to Adam M.
diff --git a/docs/plugins/smartplaylist.rst b/docs/plugins/smartplaylist.rst
index 05a1c8c7a..42e014a8e 100644
--- a/docs/plugins/smartplaylist.rst
+++ b/docs/plugins/smartplaylist.rst
@@ -59,9 +59,10 @@ to albums that have a ``for_travel`` extensible field set to 1::
       album_query: 'for_travel:1'
       query: 'for_travel:1'
 
-By default, all playlists are regenerated after every beets command that
-changes the library database. To force regeneration, you can invoke it manually
-from the command line::
+By default, all playlists are automatically regenerated after every beets
+command that changes the library database. This can be disabled by specifying
+``auto: no``. To force regeneration, you can invoke it manually from the
+command line::
 
     $ beet splupdate