diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.5.0.1
+- Fix `next_filename` to display correct filename URI.
+  - It was using Id instead of Position. Position is a 0-indexed
+    number, Id is 1-indexed and it was returning one song after the
+    intended one in the playlist. Oops.
+
 # v1.5
 - Add json keys
   - `volume`: Integer for volume percentage
diff --git a/mpd-current-json.cabal b/mpd-current-json.cabal
--- a/mpd-current-json.cabal
+++ b/mpd-current-json.cabal
@@ -7,7 +7,7 @@
 -- PVP summary:     +-+------- breaking API changes
 --                  | | +----- non-breaking API additions
 --                  | | | +--- code changes with no API change
-version:            1.5.0.0
+version:            1.5.0.1
 synopsis:           Print current MPD song and status as JSON
 
 -- A longer description of the package.
diff --git a/src/Main.hs b/src/Main.hs
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -111,7 +111,7 @@
       nextId         = getStatusIdInt MPD.stNextSongID st
       playlistLength = getStatusField st MPD.stPlaylistLength
 
-  nextPlaylistSong <- withMpdOpts $ MPD.playlistInfo nextId
+  nextPlaylistSong <- withMpdOpts $ MPD.playlistInfo nextPos
   let filename = maybePathCurrentSong cs
       filenameNext = maybePathNextPlaylistSong nextPlaylistSong