diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py
index 931078d28..eff717a9f 100644
--- a/beetsplug/spotify.py
+++ b/beetsplug/spotify.py
@@ -214,8 +214,10 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
         return AlbumInfo(
             album=album_data['name'],
             album_id=spotify_id,
+            spotify_album_id=spotify_id,
             artist=artist,
             artist_id=artist_id,
+            spotify_artist_id=artist_id,
             tracks=tracks,
             albumtype=album_data['album_type'],
             va=len(album_data['artists']) == 1
@@ -242,8 +244,10 @@ class SpotifyPlugin(MetadataSourcePlugin, BeetsPlugin):
         return TrackInfo(
             title=track_data['name'],
             track_id=track_data['id'],
+            spotify_track_id=track_data['id'],
             artist=artist,
             artist_id=artist_id,
+            spotify_artist_id=artist_id,
             length=track_data['duration_ms'] / 1000,
             index=track_data['track_number'],
             medium=track_data['disc_number'],
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 8c4a0ed5b..72b1cf1fe 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -8,9 +8,12 @@ Changelog goes here!
 
 New features:
 
+* :doc:`/plugins/spotify`: The plugin now records Spotify-specific IDs in the
+  `spotify_album_id`, `spotify_artist_id`, and `spotify_track_id` fields.
+  :bug:`4348`
 * Create the parental directories for database if they do not exist.
   :bug:`3808` :bug:`4327`
-* :ref:`musicbrainz-config`: a new :ref:`musicbrainz.enabled` option allows disabling 
+* :ref:`musicbrainz-config`: a new :ref:`musicbrainz.enabled` option allows disabling
   the MusicBrainz metadata source during the autotagging process
 * :doc:`/plugins/kodiupdate`: Now supports multiple kodi instances
   :bug:`4101`
@@ -20,7 +23,7 @@ New features:
 * :doc:`/plugins/convert`: Add a new `auto_keep` option that automatically
   converts files but keeps the *originals* in the library.
   :bug:`1840` :bug:`4302`
-* Added a ``-P`` (or ``--disable-plugins``) flag to specify one/multiple plugin(s) to be 
+* Added a ``-P`` (or ``--disable-plugins``) flag to specify one/multiple plugin(s) to be
   disabled at startup.
 
 Bug fixes: