diff --git a/beets/library.py b/beets/library.py
index 29d1a6966..65c27a0c9 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -1516,7 +1516,7 @@ class Album(BaseAlbum):
         """
         with self._library.transaction() as tx:
             rows = tx.query(
-                'SELECT * FROM items WHERE album_id=?',
+                'SELECT * FROM items WHERE album_id=? ORDER BY track',
                 (self.id,)
             )
         return ResultIterator(rows)
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1d066f84f..18e02c009 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -20,6 +20,9 @@ Changelog
 * :doc:`/plugins/lyrics`: Searches now strip "featuring" artists when
   searching for lyrics, which should increase the hit rate for these tracks.
   Thanks to Fabrice Laporte.
+* When listing the items in an album, the items are now always in track-number
+  order. This should lead to more predictable listings from the
+  :doc:`/plugins/importfeeds`.
 * :doc:`/plugins/web`: Fix an error when specifying the hostname on the
   command line.
 * :doc:`/plugins/web`: The underlying API was expanded slightly to support