diff --git a/media-sound/mixxx/Manifest b/media-sound/mixxx/Manifest
index 011ef45..4632be9 100644
--- a/media-sound/mixxx/Manifest
+++ b/media-sound/mixxx/Manifest
@@ -1,6 +1,7 @@
-AUX mixxx-9999-desktop-file.patch 334 SHA256 9807e42755dcc72c6e5fe30113a4ca6b06396b0b8cd1fd65227b2584fd39b01f SHA512 58d73a35c3fd9d1390d95915878d3120b4d0f1969562f2f63dc550570889687ce471e4b450e7ae708625332f083a1b8dbf926c4fa3784010be6f5227acb61931 WHIRLPOOL 843c64eccbd415210efc1f021cb7e9bc8acab5509f1a6c53a3c277c77687b02a36c76c3ac0b6f78efaaa334b2e4456951401c2972cb31d6ac2e5c92bc0ef0854
-AUX mixxx-9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
-AUX mixxx-9999-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
+AUX mixxx-1.12.9999-desktop-file.patch 334 SHA256 9807e42755dcc72c6e5fe30113a4ca6b06396b0b8cd1fd65227b2584fd39b01f SHA512 58d73a35c3fd9d1390d95915878d3120b4d0f1969562f2f63dc550570889687ce471e4b450e7ae708625332f083a1b8dbf926c4fa3784010be6f5227acb61931 WHIRLPOOL 843c64eccbd415210efc1f021cb7e9bc8acab5509f1a6c53a3c277c77687b02a36c76c3ac0b6f78efaaa334b2e4456951401c2972cb31d6ac2e5c92bc0ef0854
+AUX mixxx-1.12.9999-docs.patch 445 SHA256 9250ab6b2368ad03b8c54d767fda1d23cd826340189cf8989a3156b76b375411 SHA512 cad756af2cfc90433b20d0a867aed9b85ee822691c5c8adc97de6943273823a769d8e6d4912a71f00bbead2cd96cff91cc12fb2fb8de547bf76dabd74372490e WHIRLPOOL 91b48e4577ff127065bbcae34d945613029850b43831209cc1b1f9c2d1da7fc3c02c9fa96dd958fe85f934749bcbace1b2c6c3c358306dc6d6ea91935337a327
+AUX mixxx-1.12.9999-system-libs.patch 5847 SHA256 0b5cb0db508eb921f9461e20a490afd729a332d11624d192738b19f5cb34a010 SHA512 5caf650bf917cb36605ef8b04a8fdc4715772f6801ebdf25b1bd36d7293c996e0af4dae473cc0a6a72fdb9b93430c24ba50e78fe97503d20c3b5532c4e9d0c65 WHIRLPOOL 4eab9f4038fdc40cc9a8f92a161ab6990df21c51a4cf3b4b7dc990bae3923280d9798c968738de0d70180b5d0fb1163ff17d6cce715e1e04b6431674e25b8c6e
+AUX mixxx-1.12.9999-use-cpp-built-in-types.patch 944 SHA256 69e1e1af26f0893ea7d5a3c2eb0cd8207e50b9a0de30194dc7719d3057cd1540 SHA512 6d0750bb3d1261602af99d401b63183d1c2380cd4958c1236fe1d4f618f541b3e77ed00ea14b341a474fc929c21b9ce20f8cb051de7f23db002d2d1c0c68a357 WHIRLPOOL e0294c52f45309bad2f07120c4480690d3373810689166ee7b328f689ddb93a1e50d44570dc7e81426dec8827cd4b476527772a6ef60936f6656288d47bdc024
 DIST mixxx-1.12.0_beta1.tar.gz 24780154 SHA256 1204b04044b090b297c2863118dde4f2962d557f9bf606b1069efe824e18616f SHA512 1fe6ca8c876b2a33c3e0a329ddf53856e037f2e8e6574dae86c46a364cf604f124d0f8e2f5abd150307c4baeeeb7cf9c516d681989d2f7cf54c421ce7ddb76bb WHIRLPOOL e4e970e301509d36d555d07b317828f81734509f739bebeac174007048a800910eecd546c8e1beacb2baec7a96220a35012abdde4703b7c67e497843d915bb53
-EBUILD mixxx-1.12.0_beta1.ebuild 2365 SHA256 5305b8efdcc241424c1bb98bb5d1450a5bf873fd0761f4c22f107384ec17b647 SHA512 eb76d82b4c61441e8aa5130333a0fd386af68f86a70bca9b52f45b222faff19960333f6fd3d62f58ffb6f7c5545a7001b2d1cb4042e1cbe049aec83a2d5db338 WHIRLPOOL f728a21ee76df667584a015b0383e5c6f101bd7712c84441d8069322fca48e641204bba5ed1e96cb3866bb01cd2648282fef478d4f2e1a2d6f08be5b5e4f418e
-EBUILD mixxx-1.12.9999.ebuild 2358 SHA256 c4bc19cbb1ef2de0fef48fb8aecfb93a517933f32322194beb2f8a04ceef26c1 SHA512 f58d28deb6fa43a1b2e2ace3d6ca99b55bc512626351bf15d507498593978ef3049b164fc2fe5aa481da9c5f255a04f69222d0f18c2b8a9b0285c9c9a46ca6d6 WHIRLPOOL f6464c42f9b005f2ccf8bc9719ca933c6ff4b932e6f7aed551f9b2ac09e69e3479e2bbd2ec3a096085b4992d4dc9665f3cd672de68139061101ed857c4bd0f97
+EBUILD mixxx-1.12.0_beta1.ebuild 2961 SHA256 136b1f06e0741c559a3e9f5d17b883fbe261c3df47a20e55a9b8290c8f9c6584 SHA512 ae9d5b708a839ea3bcecaf163cf904762a67ad53be6b0a276b304daa2c251211ad893433019684b7f1917356ab91043e11fd2342b18cad62d807deb04b134bba WHIRLPOOL 956fd67fc285ff614be2ba5cf6cede27ffbb216f0877096978eadfc66785f508538b2dfd27004bd8f6b197b3c8ad268c7d4207f4158def81d90dd3ee210c8e8c
+EBUILD mixxx-1.12.9999.ebuild 2959 SHA256 888d1f51fc5ccc702ed4313ea90c369e6fe27f8e5b398951d9303a2a9b4ea7de SHA512 4c92b4e82e51df2e7d595add2752cad12734860e0a82f337c78a6fbbb5717a570b05b21880adfcba7077ae6d7a23f38cd309a084695e627b05e67ed1e7b51e02 WHIRLPOOL 2f4dab5f1c76cbc35adc3b69f295d3b96a934675404378c2410b6b222d8c5576ca10aacef36526a4ec472e825fd8a2a7ce34aa2b08fae4dd788cebda11362d13
diff --git a/media-sound/mixxx/files/mixxx-9999-desktop-file.patch b/media-sound/mixxx/files/mixxx-1.12.9999-desktop-file.patch
similarity index 100%
rename from media-sound/mixxx/files/mixxx-9999-desktop-file.patch
rename to media-sound/mixxx/files/mixxx-1.12.9999-desktop-file.patch
diff --git a/media-sound/mixxx/files/mixxx-9999-docs.patch b/media-sound/mixxx/files/mixxx-1.12.9999-docs.patch
similarity index 100%
rename from media-sound/mixxx/files/mixxx-9999-docs.patch
rename to media-sound/mixxx/files/mixxx-1.12.9999-docs.patch
diff --git a/media-sound/mixxx/files/mixxx-9999-system-libs.patch b/media-sound/mixxx/files/mixxx-1.12.9999-system-libs.patch
similarity index 100%
rename from media-sound/mixxx/files/mixxx-9999-system-libs.patch
rename to media-sound/mixxx/files/mixxx-1.12.9999-system-libs.patch
diff --git a/media-sound/mixxx/files/mixxx-1.12.9999-use-cpp-built-in-types.patch b/media-sound/mixxx/files/mixxx-1.12.9999-use-cpp-built-in-types.patch
new file mode 100644
index 0000000..a70c60e
--- /dev/null
+++ b/media-sound/mixxx/files/mixxx-1.12.9999-use-cpp-built-in-types.patch
@@ -0,0 +1,35 @@
+diff -dNur a/src/soundsourceffmpeg.cpp b/src/soundsourceffmpeg.cpp
+--- a/src/soundsourceffmpeg.cpp	2015-09-18 11:48:36.423194604 +0000
++++ b/src/soundsourceffmpeg.cpp	2015-09-18 11:56:15.933501047 +0000
+@@ -509,7 +509,7 @@
+ 
+     m_iCurrentMixxTs = filepos;
+ 
+-    m_bIsSeeked = TRUE;
++    m_bIsSeeked = true;
+ 
+     return filepos;
+ }
+@@ -521,7 +521,7 @@
+         // Make sure we allways start at begining and cache have some
+         // material that we can consume.
+         seek(0);
+-        m_bIsSeeked = FALSE;
++        m_bIsSeeked = false;
+     }
+ 
+     getBytesFromCache((char *)destination, m_iCurrentMixxTs, size);
+@@ -530,11 +530,11 @@
+     //  As this is also Hack
+     // If we don't seek like we don't on analyzer.. keep
+     // place in mind..
+-    if (m_bIsSeeked == FALSE) {
++    if (m_bIsSeeked == false) {
+         m_iCurrentMixxTs += size;
+     }
+ 
+-    m_bIsSeeked = FALSE;
++    m_bIsSeeked = false;
+     return size;
+ 
+ }
diff --git a/media-sound/mixxx/mixxx-1.12.0_beta1.ebuild b/media-sound/mixxx/mixxx-1.12.0_beta1.ebuild
index 03858fa..30007d2 100644
--- a/media-sound/mixxx/mixxx-1.12.0_beta1.ebuild
+++ b/media-sound/mixxx/mixxx-1.12.0_beta1.ebuild
@@ -13,7 +13,8 @@ SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV/_/-}.tar.gz -> ${
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio shout wavpack"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio +qt4 qt5 shout wavpack"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 RDEPEND="dev-libs/protobuf
 	media-libs/chromaprint
@@ -31,13 +32,29 @@ RDEPEND="dev-libs/protobuf
 	sci-libs/fftw:3.0
 	virtual/glu
 	virtual/opengl
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	dev-qt/qttest:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtsql:4
+		dev-qt/qtsvg:4
+		dev-qt/qttest:4
+		dev-qt/qtwebkit:4
+		dev-qt/qtxmlpatterns:4
+	)
+	qt5? (
+		>=dev-qt/qtscript-5.4.2:5[scripttools]
+		>=dev-qt/qtsvg-5.4.2:5
+		>=dev-qt/qtsql-5.4.2:5
+		>=dev-qt/qtxml-5.4.2:5
+		>=dev-qt/qtopengl-5.4.2:5
+		>=dev-qt/qtgui-5.4.2:5
+		>=dev-qt/qtnetwork-5.4.2:5
+		>=dev-qt/qtcore-5.4.2:5
+		>=dev-qt/qtwidgets-5.4.2:5
+		>=dev-qt/qttest-5.4.2:5
+		>=dev-qt/qtxmlpatterns-5.4.2:5
+		>=dev-qt/qtconcurrent-5.4.2:5
+	)
 	aac? (
 		media-libs/faad2
 		media-libs/libmp4v2:0
@@ -55,8 +72,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}-release-${PV/_/-}"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-system-libs.patch
-	epatch "${FILESDIR}"/${PN}-9999-docs.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-system-libs.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-docs.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-use-cpp-built-in-types.patch
 
 	# use multilib compatible directory for plugins
 	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
@@ -68,12 +86,19 @@ src_prepare() {
 }
 
 src_configure() {
+	if use qt5 ; then
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt5
+	else
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4
+	fi
+
 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
+		qtdir="${QTDIR}"
 		hifieq=1
 		vinylcontrol=1
 		optimize=0
+		$(use_scons qt5)
 		$(use_scons aac faad)
 		$(use_scons debug qdebug)
 		$(use_scons hid hid)
diff --git a/media-sound/mixxx/mixxx-1.12.9999.ebuild b/media-sound/mixxx/mixxx-1.12.9999.ebuild
index 9f6f9f2..49417b9 100644
--- a/media-sound/mixxx/mixxx-1.12.9999.ebuild
+++ b/media-sound/mixxx/mixxx-1.12.9999.ebuild
@@ -14,7 +14,8 @@ EGIT_BRANCH="1.12"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio shout wavpack"
+IUSE="aac debug doc ffmpeg hid mp3 mp4 pulseaudio +qt4 qt5 shout wavpack"
+REQUIRED_USE="^^ ( qt4 qt5 )"
 
 RDEPEND="dev-libs/protobuf
 	media-libs/chromaprint
@@ -32,13 +33,29 @@ RDEPEND="dev-libs/protobuf
 	sci-libs/fftw:3.0
 	virtual/glu
 	virtual/opengl
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	dev-qt/qtsql:4
-	dev-qt/qtsvg:4
-	dev-qt/qttest:4
-	dev-qt/qtwebkit:4
-	dev-qt/qtxmlpatterns:4
+	qt4? (
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+		dev-qt/qtsql:4
+		dev-qt/qtsvg:4
+		dev-qt/qttest:4
+		dev-qt/qtwebkit:4
+		dev-qt/qtxmlpatterns:4
+	)
+	qt5? (
+		>=dev-qt/qtscript-5.4.2:5[scripttools]
+		>=dev-qt/qtsvg-5.4.2:5
+		>=dev-qt/qtsql-5.4.2:5
+		>=dev-qt/qtxml-5.4.2:5
+		>=dev-qt/qtopengl-5.4.2:5
+		>=dev-qt/qtgui-5.4.2:5
+		>=dev-qt/qtnetwork-5.4.2:5
+		>=dev-qt/qtcore-5.4.2:5
+		>=dev-qt/qtwidgets-5.4.2:5
+		>=dev-qt/qttest-5.4.2:5
+		>=dev-qt/qtxmlpatterns-5.4.2:5
+		>=dev-qt/qtconcurrent-5.4.2:5
+	)
 	aac? (
 		media-libs/faad2
 		media-libs/libmp4v2:0
@@ -54,9 +71,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-9999-system-libs.patch
-	epatch "${FILESDIR}"/${PN}-9999-docs.patch
-	epatch "${FILESDIR}"/${PN}-9999-desktop-file.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-system-libs.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-docs.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-desktop-file.patch
+	epatch "${FILESDIR}"/${PN}-1.12.9999-use-cpp-built-in-types.patch
 
 	# use multilib compatible directory for plugins
 	sed -i -e "/unix_lib_path =/s/'lib'/'$(get_libdir)'/" src/SConscript || die
@@ -68,12 +86,19 @@ src_prepare() {
 }
 
 src_configure() {
+	if use qt5 ; then
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt5
+	else
+		QTDIR=${EPREFIX}/usr/$(get_libdir)/qt4
+	fi
+
 	myesconsargs=(
 		prefix="${EPREFIX}/usr"
-		qtdir="${EPREFIX}/usr/$(get_libdir)/qt4"
+		qtdir="${QTDIR}"
 		hifieq=1
 		vinylcontrol=1
 		optimize=0
+		$(use_scons qt5)
 		$(use_scons aac faad)
 		$(use_scons debug qdebug)
 		$(use_scons hid hid)