diff --git a/.arcconfig b/.arcconfig
new file mode 100644
index 0000000..377c7ec
--- /dev/null
+++ b/.arcconfig
@@ -0,0 +1,3 @@
+{
+  "phabricator.uri" : "https://phabricator.kde.org/"
+}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b63bf8e..deae957 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,80 +1,81 @@
 project(kalgebra)
 cmake_minimum_required(VERSION 3.0)
 
 find_package(ECM 1.7.0 REQUIRED NO_MODULE)
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH})
 
 find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Network WebSockets Sql QuickControls2 Xml Multimedia Widgets)
 include(KDEInstallDirs)
 include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDECMakeSettings)
 include(ECMInstallIcons)
 include(FeatureSummary)
 include(ECMAddAppIcon)
 
 set(CMAKE_AUTORCC ON)
 
 add_executable(vvave
     qml.qrc
     main.cpp
     babe.cpp
 
     pulpo/services/geniusService.cpp
     pulpo/services/deezerService.cpp
     pulpo/services/lastfmService.cpp
     pulpo/services/lyricwikiaService.cpp
     pulpo/services/spotifyService.cpp
     pulpo/services/musicbrainzService.cpp
     pulpo/pulpo.cpp
     pulpo/htmlparser.cpp
     services/local/taginfo.cpp
     services/local/player.cpp
     services/local/youtubedl.cpp
     services/local/linking.cpp
     services/local/socket.cpp
     services/web/babeit.cpp
     services/web/youtube.cpp
     db/conthread.cpp
     db/collectionDB.cpp
     settings/BabeSettings.cpp
     settings/fileloader.cpp
     utils/brain.cpp
     utils/babeconsole.cpp
 )
 
 if (ANDROID)
     find_package(Qt5 REQUIRED COMPONENTS AndroidExtras WebView)
 
     include(ExternalProject)
     externalproject_add(taglib
         URL http://taglib.org/releases/taglib-1.11.1.tar.gz
         CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
     )
     set(TAGLIB_INCLUDE_DIRS ${CMAKE_INSTALL_PREFIX}/include ${CMAKE_INSTALL_PREFIX}/include/taglib)
-    find_library(TAGLIB_LIBRARIES tag PATHS ${LIB_INSTALL_DIR})
+    set(TAGLIB_LIBRARIES ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}/libtag.a)
 
     target_sources(vvave PRIVATE
         android/android.cpp
         android/notificationclient.cpp
         android.qrc
     )
     target_link_libraries(vvave Qt5::AndroidExtras Qt5::WebView)
+    add_dependencies(vvave taglib)
     kde_source_files_enable_exceptions(vvave android/android.cpp android/notificationclient.cpp babe.cpp)
 else()
     find_package(Taglib REQUIRED)
     find_package(Qt5 REQUIRED COMPONENTS WebEngine)
     find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config)
     target_sources(vvave PRIVATE
         kde/kdeconnect.cpp
         kde/mpris2.cpp
         kde/notify.cpp
     )
     target_link_libraries(vvave Qt5::WebEngine KF5::ConfigCore KF5::Notifications KF5::I18n)
 endif()
 target_include_directories(vvave PRIVATE ${TAGLIB_INCLUDE_DIRS})
 target_link_libraries(vvave Qt5::Network Qt5::Sql Qt5::WebSockets Qt5::Qml Qt5::Xml Qt5::Multimedia Qt5::Widgets ${TAGLIB_LIBRARIES})
 
 install(TARGETS vvave ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 # install(FILES org.kde.vvave.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
 
 feature_summary(WHAT ALL   FATAL_ON_MISSING_REQUIRED_PACKAGES)