diff --git a/ChangeLog b/ChangeLog
index e212557a8..7be753f7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,10 +23,10 @@
     real gain. (URL is still shown in tooltip)
 14. Detailed tree view for playlists by default.
 15. Remove config compatibility with Cantata versions older than 0.7
-16. Only require 2 stop actions; stop now, or stop after current. Default stop
+16. Only have 2 stop actions; stop now, or stop after current. Default stop
     action is always 'stop now'
 17. Make 'stop after current track' assignable to KDE global shortcut.
-18. Add 'stop after current' to tray item menu.
+18. Add 'stop after current' to tray item menu, and to Cantata MPRIS interface..
 19. Try to use better text for buttons in dialogs, and not just yes/no.
 20. Dont use icons in buttons when using QGtkStyle - Gtk does not use button
     icons.
diff --git a/dbus/mpris.h b/dbus/mpris.h
index a9fe52b76..ac24a2e1f 100644
--- a/dbus/mpris.h
+++ b/dbus/mpris.h
@@ -79,6 +79,7 @@ public:
 
     void PlayPause() { mw->playPauseTrack(); }
     void Stop() { mw->stopPlayback(); }
+    void StopAfterCurrent() { mw->stopAfterCurrentTrack(); }
 
     void Play() {
         MPDStatus * const status = MPDStatus::self();
diff --git a/dbus/org.mpris.MediaPlayer2.Player.xml b/dbus/org.mpris.MediaPlayer2.Player.xml
index 3c11567fa..898c22d4e 100644
--- a/dbus/org.mpris.MediaPlayer2.Player.xml
+++ b/dbus/org.mpris.MediaPlayer2.Player.xml
@@ -8,6 +8,7 @@
 		<method name='Pause'/>
 		<method name='PlayPause'/>
 		<method name='Stop'/>
+                <method name='StopAfterCurrent'/> <!-- Cantata addition -->
 		<method name='Play'/>
 		<method name='Seek'>
 			<arg direction='in' name='Offset' type='x'/>