diff --git a/app/Models/File.php b/app/Models/File.php
index ff5d7717..d9bcdfb5 100644
--- a/app/Models/File.php
+++ b/app/Models/File.php
@@ -136,6 +136,7 @@ class File
             'title' => basename($this->path, '.'.pathinfo($this->path, PATHINFO_EXTENSION)), // default to be file name
             'length' => $info['playtime_seconds'],
             'track' => (int) $track,
+            'disc' => (int) array_get($info, 'comments.part_of_a_set.0', 1),
             'lyrics' => '',
             'cover' => array_get($info, 'comments.picture', [null])[0],
             'path' => $this->path,
diff --git a/app/Models/Song.php b/app/Models/Song.php
index a1477d43..e8868d46 100644
--- a/app/Models/Song.php
+++ b/app/Models/Song.php
@@ -24,6 +24,7 @@ use YouTube;
  * @property float  length
  * @property string lyrics
  * @property int    track
+ * @property int    disc
  * @property int    album_id
  * @property int    id
  * @property int    artist_id
@@ -50,6 +51,7 @@ class Song extends Model
         'length' => 'float',
         'mtime' => 'int',
         'track' => 'int',
+        'disc' => 'int',
     ];
 
     /**
diff --git a/app/Services/Media.php b/app/Services/Media.php
index 123ce7b2..c1a025c9 100644
--- a/app/Services/Media.php
+++ b/app/Services/Media.php
@@ -28,6 +28,7 @@ class Media
         'title',
         'length',
         'track',
+        'disc',
         'lyrics',
         'cover',
         'mtime',
diff --git a/database/migrations/2017_11_27_184010_add_disc_into_songs.php b/database/migrations/2017_11_27_184010_add_disc_into_songs.php
new file mode 100644
index 00000000..166e51a7
--- /dev/null
+++ b/database/migrations/2017_11_27_184010_add_disc_into_songs.php
@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddDiscIntoSongs extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('songs', function (Blueprint $table) {
+            $table->integer('disc')->after('track')->default(1);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('songs', function (Blueprint $table) {
+            $table->dropColumn('disc');
+        });
+    }
+}
diff --git a/resources/assets/js/components/shared/album-item.vue b/resources/assets/js/components/shared/album-item.vue
index 70bac264..3f1dba6a 100644
--- a/resources/assets/js/components/shared/album-item.vue
+++ b/resources/assets/js/components/shared/album-item.vue
@@ -36,6 +36,7 @@
 </template>
 
 <script>
+import { orderBy } from 'lodash'
 import { pluralize } from '@/utils'
 import { queueStore, artistStore, sharedStore } from '@/stores'
 import { playback, download } from '@/services'
@@ -72,7 +73,7 @@ export default {
      */
     play (e) {
       if (e.metaKey || e.ctrlKey) {
-        queueStore.queue(this.album.songs)
+        queueStore.queue(orderBy(this.album.songs, ['disc', 'track']))
       } else {
         playback.playAllInAlbum(this.album, false)
       }
diff --git a/resources/assets/js/components/shared/artist-item.vue b/resources/assets/js/components/shared/artist-item.vue
index 89ac57b1..33817fa8 100644
--- a/resources/assets/js/components/shared/artist-item.vue
+++ b/resources/assets/js/components/shared/artist-item.vue
@@ -28,6 +28,7 @@
 </template>
 
 <script>
+import { orderBy } from 'lodash'
 import { pluralize } from '@/utils'
 import { artistStore, queueStore, sharedStore } from '@/stores'
 import { playback, download } from '@/services'
@@ -68,7 +69,7 @@ export default {
      */
     play (e) {
       if (e.metaKey || e.ctrlKey) {
-        queueStore.queue(this.artist.songs)
+        queueStore.queue(orderBy(this.artist.songs, ['album_id', 'disc', 'track']))
       } else {
         playback.playAllByArtist(this.artist, false)
       }
diff --git a/resources/assets/js/components/shared/song-list.vue b/resources/assets/js/components/shared/song-list.vue
index 02349764..b7307053 100644
--- a/resources/assets/js/components/shared/song-list.vue
+++ b/resources/assets/js/components/shared/song-list.vue
@@ -49,7 +49,7 @@
 
 <script>
 import isMobile from 'ismobilejs'
-import { each } from 'lodash'
+import { each, orderBy as _orderBy } from 'lodash'
 
 import { filterBy, orderBy, event, pluralize, $ } from '@/utils'
 import { playlistStore, queueStore, songStore, favoriteStore } from '@/stores'
@@ -203,9 +203,18 @@ export default {
         this.order *= -1
       }
 
+      if (this.type === 'album') {
+        this.sortKey = this.sortKey ? this.sortKey : ['song.track']
+      }
+
       this.sortingByAlbum = Array.isArray(this.sortKey) && this.sortKey[0] === 'song.album.name'
       this.sortingByArtist = Array.isArray(this.sortKey) && this.sortKey[0] === 'song.album.artist.name'
+
       this.songRows = orderBy(this.songRows, this.sortKey, this.order)
+
+      if (this.type === 'album') {
+        this.songRows = _orderBy(this.songRows, 'song.disc')
+      }
     },
 
     /**
diff --git a/resources/assets/js/services/playback.js b/resources/assets/js/services/playback.js
index 71f0cf84..3229bad1 100644
--- a/resources/assets/js/services/playback.js
+++ b/resources/assets/js/services/playback.js
@@ -418,7 +418,7 @@ export const playback = {
   playAllByArtist ({ songs }, shuffled = true) {
     shuffled
       ? this.queueAndPlay(songs, true)
-      : this.queueAndPlay(orderBy(songs, 'album_id', 'track'))
+      : this.queueAndPlay(orderBy(songs, ['album_id', 'disc', 'track']))
   },
 
   /**
@@ -430,6 +430,6 @@ export const playback = {
   playAllInAlbum ({ songs }, shuffled = true) {
     shuffled
       ? this.queueAndPlay(songs, true)
-      : this.queueAndPlay(orderBy(songs, 'track'))
+      : this.queueAndPlay(orderBy(songs, ['disc', 'track']))
   }
 }
diff --git a/tests/Unit/FileTest.php b/tests/Unit/FileTest.php
index 11f499e0..9893adf7 100644
--- a/tests/Unit/FileTest.php
+++ b/tests/Unit/FileTest.php
@@ -32,6 +32,7 @@ class FileTest extends TestCase
             'compilation' => false,
             'title' => 'Amet',
             'track' => 5,
+            'disc' => 3,
             'lyrics' => "Foo\rbar",
             'cover' => [
                 'data' => file_get_contents(__DIR__.'/../blobs/cover.png'),
diff --git a/tests/songs/full.mp3 b/tests/songs/full.mp3
index c36051bc..e0688ce8 100644
Binary files a/tests/songs/full.mp3 and b/tests/songs/full.mp3 differ