diff --git a/multimedia/tomahawk/README b/multimedia/tomahawk/README
index 55372819aa..da323cee00 100644
--- a/multimedia/tomahawk/README
+++ b/multimedia/tomahawk/README
@@ -4,6 +4,14 @@ A new kind of music player that invites all your streams, downloads,
 cloud music storage, playlists, radio stations and friends to the same
 party. It's about time they all mingle.
 
+QT5 Warning:
+	If you have Qt5 installed, you will need to add the following cmake
+	configure flag to the qtkeychain SlackBuild as qtkeychain builds
+	with Qt5 by default if it's found. The Qt5 interface to Tomahawk is
+	experimental and not yet complete.
+
+-DBUILD_WITH_QT4="ON"
+
 This will require gst-plugins-ugly for mp3 support
 
 This optionally requires:
diff --git a/multimedia/tomahawk/tomahawk.SlackBuild b/multimedia/tomahawk/tomahawk.SlackBuild
index 1eab335d7c..fa9861d1b4 100644
--- a/multimedia/tomahawk/tomahawk.SlackBuild
+++ b/multimedia/tomahawk/tomahawk.SlackBuild
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -80,6 +80,7 @@ cd build
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DBUILD_WITH_QT4="ON" \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/multimedia/tomahawk/tomahawk.info b/multimedia/tomahawk/tomahawk.info
index f2a27c392a..9a939fd8c5 100644
--- a/multimedia/tomahawk/tomahawk.info
+++ b/multimedia/tomahawk/tomahawk.info
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="jreen libechonest LucenePlusPlus qtkeychain sparsehash quazip libwebsocketpp"
 MAINTAINER="Thorn Inurcide"
-EMAIL="thorn-inurcide@yandex.com"
+EMAIL="thorn_inurcide@zoho.com"