diff --git a/srcpkgs/tomahawk-qt5/template b/srcpkgs/tomahawk-qt5/template
index 1925dded11b..1078d9139f0 100644
--- a/srcpkgs/tomahawk-qt5/template
+++ b/srcpkgs/tomahawk-qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'tomahawk'
 pkgname=tomahawk-qt5
 version=0.8.4
-revision=5
+revision=6
 wrksrc=${pkgname%-*}-${version}
 build_style=cmake
 build_options="upower hatchet kde xmpp"
@@ -12,7 +12,8 @@ build_options_default=${build_options}
 configure_args="-DBUILD_RELEASE=ON \
  $(vopt_if hatchet '-DBUILD_HATCHET=ON' '-DBUILD_HATCHET=OFF') \
  -DBUILD_WITH_QT4=OFF \
- -DWITH_CRASHREPORTER=OFF
+ -DWITH_CRASHREPORTER=OFF \
+ -DTAGLIB_MIN_VERSION=1.10 \
  $(vopt_if kde '-DWITH_KDE4=ON' '-DWITH_KDE4=OFF') \
  $(vopt_if upower '-DWITH_UPOWER=ON' '-DWITH_UPOWER=OFF')"
 hostmakedepends="cmake pkg-config"
@@ -33,6 +34,27 @@ checksum=0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449
 provides="tomahawk-${version}_${revision}"
 replaces="tomahawk>=0"
 
+post_extract() {
+	# fix echonest-qt5 detection
+	sed -i 's|echonest/Track.h|echonest5/Track.h|' CMakeModules/FindEchonest.cmake
+	# fix echonest-qt5 includes
+	sed -i 's|^#include <echonest/|#include <echonest5/|' \
+		src/tomahawk/sourcetree/items/CategoryItems.cpp \
+		src/tomahawk/sourcetree/items/CategoryItems.cpp \
+		src/libtomahawk/playlist/dynamic/echonest/EchonestControl.h \
+		src/libtomahawk/playlist/dynamic/echonest/EchonestSteerer.cpp \
+		src/libtomahawk/playlist/dynamic/echonest/EchonestGenerator.h \
+		src/libtomahawk/EchonestCatalogSynchronizer.cpp \
+		src/libtomahawk/EchonestCatalogSynchronizer.cpp \
+		src/libtomahawk/GlobalActionManager.cpp \
+		src/libtomahawk/EchonestCatalogSynchronizer.h \
+		src/infoplugins/generic/echonest/EchonestPlugin.cpp \
+		src/infoplugins/generic/echonest/EchonestPlugin.h
+	# fix build
+	sed -i '24a#include <QDataStream>' src/libtomahawk/network/acl/AclRegistry.cpp
+	sed -i '30a#include <QDataStream>' src/libtomahawk/utils/TomahawkCache.h
+}
+
 tomahawk-qt5-devel_package() {
 	depends="tomahawk-qt5>=${version}_${revision}"
 	short_desc+=" - development files"