diff --git a/media-sound/cantata/cantata-2.2.0.recipe b/media-sound/cantata/cantata-2.3.1.recipe
similarity index 81%
rename from media-sound/cantata/cantata-2.2.0.recipe
rename to media-sound/cantata/cantata-2.3.1.recipe
index 3745b7189..85df73624 100644
--- a/media-sound/cantata/cantata-2.2.0.recipe
+++ b/media-sound/cantata/cantata-2.3.1.recipe
@@ -7,10 +7,10 @@ Cantata is a full featured Qt based client for Music Player Daemon."
 HOMEPAGE="https://github.com/CDrummond/cantata"
 COPYRIGHT="2010-2017 Craig Drummond"
 LICENSE="GNU GPL v3"
-REVISION="3"
+REVISION="1"
 SOURCE_URI="https://github.com/CDrummond/cantata/archive/v$portVersion.tar.gz"
-CHECKSUM_SHA256="000f7a8561667fc8d15fad3b8bf0ada8f693a76fed0afafa166a0225cc93e9de"
-PATCHES="cantata-$portVersion.patchset"
+CHECKSUM_SHA256="725b55b944f592a61d903e6af1c9dc3f4fc30478a457726c9956a0116475b881"
+SOURCE_FILENAME="cantata-$portVersion.tar.gz"
 ADDITIONAL_FILES="cantata.rdef"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -27,10 +27,11 @@ REQUIRES="
 	lib:libavutil$secondaryArchSuffix
 	lib:libebur128$secondaryArchSuffix
 	lib:libmpg123$secondaryArchSuffix
-#	lib:libmtp$secondaryArchSuffix
+	lib:libmtp$secondaryArchSuffix
+#	lib:libmusicbrainz5$secondaryArchSuffix
 	lib:libQt5Concurrent$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
-#	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Multimedia$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
@@ -49,10 +50,11 @@ BUILD_REQUIRES="
 	devel:libavutil$secondaryArchSuffix
 	devel:libebur128$secondaryArchSuffix
 	devel:libmpg123$secondaryArchSuffix
-#	devel:libmtp$secondaryArchSuffix
+	devel:libmtp$secondaryArchSuffix
+#	devel:libmusicbrainz5$secondaryArchSuffix
 	devel:libQt5Concurrent$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
-#	devel:libQt5DBus$secondaryArchSuffix
+	devel:libQt5DBus$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Multimedia$secondaryArchSuffix
 	devel:libQt5Network$secondaryArchSuffix
@@ -71,6 +73,9 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage cantata$secondaryArchSuffix \
+	"$appsDir"/Cantata
+
 BUILD()
 {
 	mkdir -p build
@@ -82,16 +87,17 @@ BUILD()
 		-DCMAKE_BUILD_TYPE=Release \
 		-DENABLE_UDISKS2=OFF \
 		-DENABLE_HTTP_STREAM_PLAYBACK=OFF \
-		-DENABLE_DEVICES_SUPPORT=OFF \
+		-DENABLE_DEVICES_SUPPORT=ON \
 		-DENABLE_REMOTE_DEVICES=OFF \
 		-DENABLE_LIBVLC=OFF \
-		-DENABLE_SIMPLE_MPD_SUPPORT=OFF \
 		-DENABLE_TAGLIB=ON \
 		-DENABLE_FFMPEG=ON \
 		-DENABLE_MPG123=ON \
 		-DENABLE_PROXY_CONFIG=ON \
 		-DENABLE_HTTP_SERVER=ON \
-		-DENABLE_SIMPLE_MPD_SUPPORT=ON
+		-DENABLE_SIMPLE_MPD_SUPPORT=ON \
+		-DCMAKE_CXX_FLAGS="-I`finddir B_SYSTEM_HEADERS_DIRECTORY`/QtDBus" \
+		-DCMAKE_EXE_LINKER_FLAGS="-lQt5DBus"
 
 	make $jobArgs
 }
@@ -102,11 +108,8 @@ INSTALL()
 	make install
 
 	mkdir -p $appsDir
-	mv $prefix/bin/cantata $appsDir/Cantata
-	rmdir $prefix/bin
-	rm -r $prefix/share
-	rm -r $dataDir/icons
-	rm -r $dataDir/applications
+	mv $prefix/cantata $appsDir/Cantata
+	rm -r $dataDir/cantata/icons
 
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
diff --git a/media-sound/cantata/patches/cantata-2.2.0.patchset b/media-sound/cantata/patches/cantata-2.2.0.patchset
deleted file mode 100644
index 4ed73f6c2..000000000
--- a/media-sound/cantata/patches/cantata-2.2.0.patchset
+++ /dev/null
@@ -1,69 +0,0 @@
-From 993aad8e7112942cd64502e371a71e1949a6c996 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
-Date: Thu, 2 Nov 2017 20:02:22 +0100
-Subject: [PATCH] Haiku supporting patches
-
----
- CMakeLists.txt         | 2 +-
- gui/application_qt.cpp | 6 ++++++
- 2 files changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 26dba71..69f01fd 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -225,7 +225,7 @@ else ()
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
- endif ()
- 
--if (APPLE OR WIN32)
-+if (APPLE OR WIN32 OR HAIKU)
-     get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
-     exec_program(${QT_QMAKE_EXECUTABLE} ARGS -query QT_INSTALL_TRANSLATIONS OUTPUT_VARIABLE QT_TRANSLATIONS_DIR)
- else ()
-diff --git a/gui/application_qt.cpp b/gui/application_qt.cpp
-index e08d984..7e0f175 100644
---- a/gui/application_qt.cpp
-+++ b/gui/application_qt.cpp
-@@ -23,8 +23,10 @@
- 
- #include "application_qt.h"
- #include "config.h"
-+#ifdef QT_QTDBUS_FOUND
- #include <QDBusConnection>
- #include <QDBusMessage>
-+#endif
- #include <QDir>
- #include <QIcon>
- 
-@@ -44,6 +46,7 @@ Application::Application(int &argc, char **argv)
- 
- bool Application::start()
- {
-+#ifdef QT_QTDBUS_FOUND
-     if (QDBusConnection::sessionBus().registerService(CANTATA_REV_URL)) {
-         setupIconTheme(this);
-         return true;
-@@ -52,10 +55,12 @@ bool Application::start()
-     // ...and activate window!
-     QDBusConnection::sessionBus().send(QDBusMessage::createMethodCall("mpd.cantata", "/org/mpris/MediaPlayer2", "", "Raise"));
-     return false;
-+#endif
- }
- 
- void Application::loadFiles()
- {
-+#ifdef QT_QTDBUS_FOUND
-     QStringList args(arguments());
-     if (args.count()>1) {
-         args.takeAt(0);
-@@ -65,5 +70,6 @@ void Application::loadFiles()
-         m.setArguments(a);
-         QDBusConnection::sessionBus().send(m);
-     }
-+#endif
- }
- 
--- 
-2.14.2
-