diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 5dcfe62..b23714e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,4 +1,5 @@
 AUX mixxx-2.0.0-docs.patch 435 BLAKE2B c2e9b09abb293e59b2af49527eccf07c9488ae5e30e29e6c4d6330cc298a568ee7dd7014af6b9c1f1c4d98b8c11c96da7f74660eb4b3b522f449e7a6a431addc SHA512 01ab76466f782f538c894e460f7694553ae12804651f68aabb6aaa0dbdc89e2ff7e2b51529b0f112cee42c8053b75fc64241a9c8898def8cf1c76231b1ec5d59
+AUX mixxx-2.1.0-components-js-fixes.patch 3370 BLAKE2B ff9295a8c938e9c3a526e206792cd27cd4025ea07ede79da844cbd80565f10020b8856bdfbb2cf7557dba0bc8b3d775eb10c45f689d975aad13c35a22705a4a0 SHA512 ff27ad09b119bbf51e678a84c5eb60f9c6822a55160ea9d175f043caa33005d311d10366c91a1b7f402e6d7039cabac675aa35f893f02efe0015e831f2751bc8
 AUX mixxx-2.1.0-debug-assert-and-fix-false-poisitiv-restart-request.patch 5694 BLAKE2B 7732252cf6438df9d52e6de8ceaaf6b2e1c30e35d8154eb7af5d94641346117d4ab0b5501686909d35c81a5fd5aa9442831f11b66faaec782c11a55e14a11363 SHA512 ee35ea84db8bf91cd2f14dd779faa91857df7bcc376525d533e65c778e241a5e66c829ab208e2da5d4afb3a48571042c13e5092c4974a07a9ea11146df68d326
 AUX mixxx-2.1.0-deere-add-gain-knob-to-expanded-sampler-view.patch 1116 BLAKE2B a32d877d6877a2dfc3b12b1dc6e6b40342120a735aa35814d203a7c9e5581f40ec9950c5732f6698e4facbe0e3b98d278e1c2ca39c880e141d863e3042407863 SHA512 8b7093ded2c79ab7f7adc7b578f3b349a364fe5c3d01a4617184a64f30799f336d5911221f79478bf8e61159b99144584efef1add0df835fa84d309ba68ea0cb
 AUX mixxx-2.1.0-denon-mc6000mk2-use-ramping-for-back-spins.patch 64070 BLAKE2B fd6941c4c995559e12900db68a92c32e79ee94841cb0c7f536296ef079db39fdcde6014c697f94d2f2d92d17c8e41f72c02343cdadc8054816ca2d6ca98b4dc4 SHA512 7d481cec81e88f7fefeff92969a49881ffaca9bd7fb17c215c45363d3078e9e31350829299479eb111000a04924634ff1b25579f951d6da9dc52ac4d3ac38a96
@@ -22,4 +23,4 @@ AUX mixxx-2.1.0-pioneer-ddj-sx-mapping-bugfixes.patch 11255 BLAKE2B 9e15935f3fcf
 AUX mixxx-2.1.0-swap-default-values-for-temp-perm-ratechanges.patch 1534 BLAKE2B 30e2c7fe396919fcdfba7102f360e307e2104bfa6480ec5615bc1482f2e496f99435d745468621f6ff7ae15e0e4857fd6db692061cf5d7b19b0bc7672b889aea SHA512 e0c6365f26313935b503de36edb9ed247333e892352645d5379659bc7a53761b7b24d1a162dee38cb776e17f5e8741d5235713d47f5812975169395bb4d00f05
 AUX mixxx-2.1.0-use-an-in-memory-database-to-speed-up-library-tests.patch 3086 BLAKE2B d2cb0b7992cdb07b1ba2accde1d272cd3f75adf8bd3bb2450ad9203db5d7978c9b29dbf6e278a2a1f1fb8fb84f28b23f276f0f999b3e5d77c272b91716dcc9f1 SHA512 a6fefbc80f8facc8cd0bf501858b4dadb6ebe4bf476dc97273ad7e97ae2c0840ca9bd6b0b3aaa34caa837b967ee7fa12635c7c2957241ca6aff5a26531b6e25f
 DIST mixxx-2.1.0-src.tar.gz 34835250 BLAKE2B 7a90c3794a146001fd0df6bb7c9c6231c0d26814eafc5c83da666d511d7af0e193b75da9b8728ad399dbef208cf2437881df2c87818e503945b02591bc300567 SHA512 d9f4fab92c2896ec455e2041aa6033f9a9091d2915a185a99427b9c35afe7c99565350ce477bf0487c6276c9585875f0be61f310779ae90195917d2e995bbf90
-EBUILD mixxx-2.1.0.ebuild 4222 BLAKE2B 11bc982a6ebd2c5b4a0070f9b0f4de511092741694b93929161875f7f4c438072dabec7ba5a407a12d8a5a267556da503aeb720d3df7cd0a5132b6373bff52f2 SHA512 f14876e9651a37c4f2982fb66b4a9d08f7a798f5e56ce16942189b7ae3c4a6b296b5a6812f9f537ec24185336d1b0f67907d759d002298c9dce669efea8dde42
+EBUILD mixxx-2.1.0.ebuild 4267 BLAKE2B 5ecf6a8a9f36e1ad563f4caa909a49239a6eec3ebe1d3f1b2ff5bcc295dfaeadb0dc357f3a98f5961f47e9b2e5d00eb7473bc92eae095af8650f9a4cee35c9bd SHA512 af9ddc98cf0bc19efc6418bfbbd4e2af68661daa18834e605955f3238e8f4b0488aba9d5ed27fef1028be1920b8fd8b66f5e6327c1af9065b6b99ea9f84a92b1
diff --git a/media-sound/mixxx/files/mixxx-2.1.0-components-js-fixes.patch b/media-sound/mixxx/files/mixxx-2.1.0-components-js-fixes.patch
new file mode 100644
index 0000000..32cd597
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-2.1.0-components-js-fixes.patch
@@ -0,0 +1,68 @@
+From b677c529d756f32c52761abeed82b3e58bb2e5a1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= <seb@wirrsal.net>
+Date: Sun, 6 May 2018 12:06:07 +0200
+Subject: [PATCH 1/2] =?UTF-8?q?components.js:=20Don=E2=80=99t=20clobber=20?=
+ =?UTF-8?q?component=20container=20groups?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since ‘forEachComponent’ evaluates callbacks within the context of the current
+component container, ‘this.currentDeck’ will be undefined after we recurse into
+a component container inside of the current deck.
+
+Instead, we now propagate the current deck downwards by referring to the
+argument ‘setCurrentDeck’ was invoked with.
+---
+ res/controllers/midi-components-0.0.js | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/res/controllers/midi-components-0.0.js b/res/controllers/midi-components-0.0.js
+index 3f7f3b3dac..8ab3d2b8d0 100644
+--- a/res/controllers/midi-components-0.0.js
++++ b/res/controllers/midi-components-0.0.js
+@@ -578,11 +578,11 @@
+             this.currentDeck = newGroup;
+             this.reconnectComponents(function (component) {
+                 if (component.group.search(script.channelRegEx) !== -1) {
+-                    component.group = this.currentDeck;
++                    component.group = newGroup;
+                 } else if (component.group.search(script.eqRegEx) !== -1) {
+-                    component.group = '[EqualizerRack1_' + this.currentDeck + '_Effect1]';
++                    component.group = '[EqualizerRack1_' + newGroup + '_Effect1]';
+                 } else if (component.group.search(script.quickEffectRegEx) !== -1) {
+-                    component.group = '[QuickEffectRack1_' + this.currentDeck + ']';
++                    component.group = '[QuickEffectRack1_' + newGroup + ']';
+                 }
+                 // Do not alter the Component's group if it does not match any of those RegExs.
+ 
+
+From 5f604c0b88fd2d0d18e4d97fdb7c781cfd85f7b7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Sebastian=20Reu=C3=9Fe?= <seb@wirrsal.net>
+Date: Sun, 6 May 2018 14:51:48 +0200
+Subject: [PATCH 2/2] =?UTF-8?q?components.js:=20Be=20more=20robust=20in=20?=
+ =?UTF-8?q?=E2=80=98setCurrentDeck=E2=80=99?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+‘component.group’ might be unset, in which case scripts will fail silently.
+Let’s guard against this case.
+---
+ res/controllers/midi-components-0.0.js | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/res/controllers/midi-components-0.0.js b/res/controllers/midi-components-0.0.js
+index 8ab3d2b8d0..4e5dec43d1 100644
+--- a/res/controllers/midi-components-0.0.js
++++ b/res/controllers/midi-components-0.0.js
+@@ -577,7 +577,8 @@
+         setCurrentDeck: function (newGroup) {
+             this.currentDeck = newGroup;
+             this.reconnectComponents(function (component) {
+-                if (component.group.search(script.channelRegEx) !== -1) {
++                if (component.group === undefined
++                      || component.group.search(script.channelRegEx) !== -1) {
+                     component.group = newGroup;
+                 } else if (component.group.search(script.eqRegEx) !== -1) {
+                     component.group = '[EqualizerRack1_' + newGroup + '_Effect1]';
diff --git a/media-sound/mixxx/mixxx-2.1.0.ebuild b/media-sound/mixxx/mixxx-2.1.0.ebuild
index 1e1fd21..e0588fb 100644
--- a/media-sound/mixxx/mixxx-2.1.0.ebuild
+++ b/media-sound/mixxx/mixxx-2.1.0.ebuild
@@ -85,7 +85,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-optimize-flac-decoding.patch
 	"${FILESDIR}"/${P}-detect-m4a-decoding-errors-on-windows.patch
 	"${FILESDIR}"/${P}-fix-cachingreader-compiler-warnings-about-non-trivial-types.patch
-
+	"${FILESDIR}"/${P}-components-js-fixes.patch
 )
 
 S="${WORKDIR}/${PN}-release-${PV}"