diff --git a/docs/src/config/File.md b/docs/src/config/File.md
index bd9702f2..523b3140 100644
--- a/docs/src/config/File.md
+++ b/docs/src/config/File.md
@@ -85,6 +85,9 @@ volume_normalisation = true
 # The normalisation pregain that is applied for each song.
 normalisation_pregain = -10
 
+# After the music playback has ended, start playing similar songs based on the previous tracks.
+autoplay = true
+
 # The port `spotifyd` uses to announce its service over the network.
 zeroconf_port = 1234
 
diff --git a/src/config.rs b/src/config.rs
index 236fbb4f..efbf02de 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -371,7 +371,7 @@ pub struct SharedConfigValues {
     #[structopt(long, possible_values = &DEVICETYPE_VALUES, value_name = "string")]
     device_type: Option<DeviceType>,
 
-    /// Autoplay on connect
+    /// Start playing similar songs after your music has ended
     #[structopt(long)]
     #[serde(default)]
     autoplay: bool,
@@ -458,6 +458,7 @@ impl fmt::Debug for SharedConfigValues {
             .field("zeroconf_port", &self.zeroconf_port)
             .field("proxy", &self.proxy)
             .field("device_type", &self.device_type)
+            .field("autoplay", &self.autoplay)
             .finish()
     }
 }
@@ -527,6 +528,7 @@ impl SharedConfigValues {
         self.use_keyring |= other.use_keyring;
         self.volume_normalisation |= other.volume_normalisation;
         self.no_audio_cache |= other.no_audio_cache;
+        self.autoplay |= other.autoplay;
     }
 }