diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index b6c250c..e28863e 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,7 +1,8 @@
 AUX mixxx-1.12.0_beta1-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
 AUX mixxx-1.12.0_beta1-use-cpp-built-in-types.patch 944 SHA256 69e1e1af26f0893ea7d5a3c2eb0cd8207e50b9a0de30194dc7719d3057cd1540 SHA512 6d0750bb3d1261602af99d401b63183d1c2380cd4958c1236fe1d4f618f541b3e77ed00ea14b341a474fc929c21b9ce20f8cb051de7f23db002d2d1c0c68a357 WHIRLPOOL e0294c52f45309bad2f07120c4480690d3373810689166ee7b328f689ddb93a1e50d44570dc7e81426dec8827cd4b476527772a6ef60936f6656288d47bdc024
 AUX mixxx-1.12.9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
+AUX mixxx-1.12.9999-optional-libshout.patch 815 SHA256 710736e8830490da17f756b1abb9c2e00fbdb20db05bb1885deef97108757a89 SHA512 c3dde3193d38731cd30bd29a51211e7ef5dec4bd23c9886192c91e2184f984ba720c74c4bc1f8be47c1c708d7e65b52d8e82f8262c63142c2f201db25e53ce44 WHIRLPOOL ed0144a5c5bd15a288f42f94ec675df4d7ebd6dc02ea0363984d927feb96e4d1ea3e1d43019c57006748ce88249fae8fc7608f24169fde021154d37105647977
 AUX mixxx-1.12.9999-system-libs.patch 5820 SHA256 cab50fae35ed68bec4e15e8ddf8476fec818be857f9cc82eb403736b8d4fe7a5 SHA512 1d078ce55f3d972e87cc8e5bce755958dc5c16321511472ebd14a3572d13d836e1a41d8b4f76d69f06ede4d64981adb804788528662cc36b6ee80e262cf71086 WHIRLPOOL 6022ce76ba80d9867d3b28b179ef98dbee84169e8296dccf0eec9404f562df5b27f7fe5c191a1de3d99ee719cb5d9891b59a2f77fa62dc1ba269059df7ac2013
 DIST mixxx-1.12.0_beta1.tar.gz 24780154 SHA256 1204b04044b090b297c2863118dde4f2962d557f9bf606b1069efe824e18616f SHA512 1fe6ca8c876b2a33c3e0a329ddf53856e037f2e8e6574dae86c46a364cf604f124d0f8e2f5abd150307c4baeeeb7cf9c516d681989d2f7cf54c421ce7ddb76bb WHIRLPOOL e4e970e301509d36d555d07b317828f81734509f739bebeac174007048a800910eecd546c8e1beacb2baec7a96220a35012abdde4703b7c67e497843d915bb53
 EBUILD mixxx-1.12.0_beta1.ebuild 2967 SHA256 f3f6f0ace4be8d81bc845a0f6b14863b87f6ea646591e9074603c955d8d696cd SHA512 dba6f02ea2f9e314e1a323a3130448daddd0301f1387691b737a5cdc2363d50b5471360a5e2982e9ace2c8f237ecfa793c46405c6998edb1618afe38deb5602a WHIRLPOOL 1d2468c49cccc84b03c705672a33dcf5ff33fe5755908ca99a6a2eaf534c39550cdad50cfcb9cfe93dbb2fe9ebdc2e108baa39dd1b2498d366024ba810d661e0
-EBUILD mixxx-1.12.9999.ebuild 2706 SHA256 8913dc37c41c5574a881294030ba68d3fd9a134d8702eddd01031c24770f8958 SHA512 afbdce0cbec19a76a94e6009d84523672ec8b44ce8cbb55b610f29e336ebe664cc98ab76b1e049671c0750dab02b3d57313ca754e71610b1fb19b6e59b9b4a71 WHIRLPOOL a1e4acc2bc8198fc0fa602862ce48c519c852129dd0a1891eff34e15429023d24287702db209ef370a082eec2e49503db06915a83595084ed792dd8c2c271e5d
+EBUILD mixxx-1.12.9999.ebuild 2741 SHA256 cdbb9d06894a0b60cf1f13add79a063787f1ba1058d66fefd118f913967689dc SHA512 1a2174a5b6de9a91fc82ee7affa7df138ea0ca184dd4747145161cc43be4df04769318137a3cdcab146b5f81f5f1053439dbb567b8eb556da6a0565ce2383113 WHIRLPOOL 5f3f3fc96993bcdef39e1df7cfe07177b511017484039dd8617bcea2ef7770436761ed905064569e66b91dd850398b76200e022a29ceb0423631bd46dc99b906
diff --git a/media-sound/mixxx/files/mixxx-1.12.9999-optional-libshout.patch b/media-sound/mixxx/files/mixxx-1.12.9999-optional-libshout.patch
new file mode 100644
index 0000000..d9250f6
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.12.9999-optional-libshout.patch
@@ -0,0 +1,26 @@
+diff --git a/src/util/version.cpp b/src/util/version.cpp
+index 57203ed..77eee0e 100644
+--- a/src/util/version.cpp
++++ b/src/util/version.cpp
+@@ -12,7 +12,9 @@
+ #ifdef WIN64
+ #define WIN32
+ #endif
++#ifdef __SHOUTCAST_
+ #include <shout/shout.h>
++#endif
+ #ifdef WIN64
+ #undef WIN32
+ #endif
+@@ -88,8 +90,10 @@ QStringList Version::dependencyVersions() {
+     result
+             // Should be accurate.
+             << QString("Qt: %1").arg(qVersion())
++#ifdef __SHOUTCAST_
+             // Should be accurate.
+             << QString("libshout: %1").arg(shout_version(NULL, NULL, NULL))
++#endif
+             // The version of the RubberBand headers Mixxx was compiled with.
+             << QString("RubberBand: %1").arg(RUBBERBAND_VERSION)
+             // The version of the SoundTouch headers Mixxx was compiled with.
+
diff --git a/media-sound/mixxx/mixxx-1.12.9999.ebuild b/media-sound/mixxx/mixxx-1.12.9999.ebuild
index 2be1609..c10822c 100644
--- a/media-sound/mixxx/mixxx-1.12.9999.ebuild
+++ b/media-sound/mixxx/mixxx-1.12.9999.ebuild
@@ -33,7 +33,6 @@ RDEPEND="dev-libs/protobuf
 	sci-libs/fftw:3.0
 	virtual/glu
 	virtual/opengl
-	>=media-libs/libshout-2.3
 	qt4? (
 		dev-qt/qtgui:4
 		dev-qt/qtopengl:4
@@ -74,6 +73,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.12.9999-system-libs.patch
 	epatch "${FILESDIR}"/${PN}-1.12.9999-docs.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-optional-libshout.patch
 
 	# use multilib compatible directory for plugins
 	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die