diff --git a/ChangeLog b/ChangeLog
index f9a8cb9a4..0a068106f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 2. Allow use of 'dynamic' playlists in windows builds, but only for server mode
    cantata-dynamic.
 3. Add a gui setting to control the enforcement of single-click.
+4. When sorting tracks, sort on duration after sorting on name, title, and
+   genre. This way of tracks do not have a takc number, disc, year, etc, then
+   we will sort on the name/title before duraiton.
 
 0.8.3.1
 -------
diff --git a/mpd/song.cpp b/mpd/song.cpp
index a16e90749..6ec96a0d9 100644
--- a/mpd/song.cpp
+++ b/mpd/song.cpp
@@ -129,9 +129,6 @@ int Song::compareTo(const Song &o) const
     if (year!=o.year) {
         return year<o.year ? -1 : 1;
     }
-    if (time!=o.time) {
-        return time<o.time ? -1 : 1;
-    }
     compare=title.localeAwareCompare(o.title);
     if (0!=compare) {
         return compare;
@@ -144,6 +141,9 @@ int Song::compareTo(const Song &o) const
     if (0!=compare) {
         return compare;
     }
+    if (time!=o.time) {
+        return time<o.time ? -1 : 1;
+    }
     return file.compare(o.file);
 }