diff --git a/beets/ui/migrate.py b/beets/ui/migrate.py
index affa354af..4be5332a6 100644
--- a/beets/ui/migrate.py
+++ b/beets/ui/migrate.py
@@ -42,6 +42,7 @@ PLUGIN_NAMES = {
     'fuzzy_search': 'fuzzy',
 }
 AUTO_KEYS = ('automatic', 'autofetch', 'autoembed', 'autoscrub')
+IMPORTFEEDS_PREFIX = 'feeds_'
 CONFIG_MIGRATED_MESSAGE = u"""
 You appear to be upgrading from beets 1.0 (or earlier) to 1.1. Your
 configuration file has been migrated automatically to:
@@ -203,6 +204,11 @@ def transform_data(data):
                 # Unnecessary : hack in queries.
                 if section == 'paths':
                     key = key.replace('_', ':')
+
+                # Changed option names for importfeeds plugin.
+                if section == 'importfeeds':
+                    if key.startswith(IMPORTFEEDS_PREFIX):
+                        key = key[len(IMPORTFEEDS_PREFIX):]
                 
                 sec_out[key] = transform_value(value)
 
diff --git a/docs/plugins/importfeeds.rst b/docs/plugins/importfeeds.rst
index 6e0662b4e..745cb1702 100644
--- a/docs/plugins/importfeeds.rst
+++ b/docs/plugins/importfeeds.rst
@@ -7,17 +7,17 @@ To use the plugin, just put ``importfeeds`` on the ``plugins`` line in your
 :doc:`configuration file </reference/config>`. Then set a few options under the
 ``importfeeds:`` section in the config file.
 
-The ``feeds_dir`` configuration option can be set to specify another folder
+The ``dir`` configuration option can be set to specify another folder
 than the default library directory. Three different types of outputs coexist,
-specify the ones you want to use by setting the ``feeds_formats`` parameter: 
+specify the ones you want to use by setting the ``formats`` parameter: 
 
 - ``m3u``: catalog the imports in a centralized playlist. By default, the playlist is named ``imported.m3u``. To use a different file, just set the ``m3u_name`` parameter inside the ``importfeeds`` config section.
 - ``m3u_multi``: create a new playlist for each import (uniquely named by appending the date and track/album name). 
-- ``link``: create a symlink for each imported item. This is the recommended setting to propagate beets imports to your iTunes library: just drag and drop the ``feeds_dir`` folder on the iTunes dock icon.
+- ``link``: create a symlink for each imported item. This is the recommended setting to propagate beets imports to your iTunes library: just drag and drop the ``dir`` folder on the iTunes dock icon.
 
 Here's an example configuration for this plugin::
 
     importfeeds:
-        feeds_formats: m3u link
-        feeds_dir: ~/imports/
+        formats: m3u link
+        dir: ~/imports/
         m3u_name: newfiles.m3u