diff --git a/media-sound/qmmp/patches/qmmp-1.5.1.patchset b/media-sound/qmmp/patches/qmmp-2.0.2.patchset
similarity index 87%
rename from media-sound/qmmp/patches/qmmp-1.5.1.patchset
rename to media-sound/qmmp/patches/qmmp-2.0.2.patchset
index 3d2da8478..6fce17343 100644
--- a/media-sound/qmmp/patches/qmmp-1.5.1.patchset
+++ b/media-sound/qmmp/patches/qmmp-2.0.2.patchset
@@ -1,33 +1,33 @@
-From 452aa33b8cd84d5049fe6f992dad7df8dc899485 Mon Sep 17 00:00:00 2001
+From b6f01054a2777ffdf3f7f26394e2b588500e9525 Mon Sep 17 00:00:00 2001
 From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Sun, 30 May 2021 21:53:22 +1000
+Date: Sun, 7 Nov 2021 23:12:30 +1000
 Subject: Add haiku support
 
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0cbcd8b..c2a0ee7 100644
+index a55672a..1f0f261 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -63,7 +63,7 @@ find_package(Qt5DBus 5.4.0)
- find_package(Qt5Multimedia 5.4.0)
- find_package(Qt5Sql 5.4.0)
- find_package(Qt5WinExtras 5.4.0)
--ADD_DEFINITIONS(-DQMMP_WS_X11 -DQT_DISABLE_DEPRECATED_BEFORE=0x050400 -DQT_DEPRECATED_WARNINGS)
-+ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x050400 -DQT_DEPRECATED_WARNINGS)
- set(CMAKE_CXX_VISIBILITY_PRESET hidden)
- set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
- set(CMAKE_CXX_STANDARD 11)
-@@ -243,7 +243,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1)
+@@ -62,7 +62,7 @@ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_AUTORCC ON)
+ set(CMAKE_AUTOUIC ON)
+ 
+-ADD_DEFINITIONS(-DQMMP_WS_X11 -DQT_DISABLE_DEPRECATED_BEFORE=0x060100 -DQT_DEPRECATED_WARNINGS)
++ADD_DEFINITIONS(-DQT_DISABLE_DEPRECATED_BEFORE=0x060100 -DQT_DEPRECATED_WARNINGS)
+ ADD_COMPILE_OPTIONS(-Wall -Wextra)
+ 
+ find_package(Qt6 6.1.0 CONFIG REQUIRED COMPONENTS Widgets LinguistTools Network)
+@@ -248,7 +248,7 @@ PRINT_SUMMARY ("Two-panel File File Dialog ............" USE_TWO_PANEL_DIALOG 1)
  
  MESSAGE("")
  MESSAGE("Advanced:")
--PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED X11_FOUND AND Qt5X11Extras_FOUND)
+-PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED X11_FOUND AND Qt6BuildInternals_FOUND)
 +PRINT_SUMMARY ("Skinned user interface ................" USE_SKINNED 1)
  PRINT_SUMMARY ("Simple user interface (QSUI) .........." USE_QSUI 1)
  PRINT_SUMMARY ("Automatic charset detection ..........." USE_ENCA ENCA_FOUND)
  PRINT_SUMMARY ("MPEG plugin with LibRCD support ......." USE_LIBRCD LIBRCD_FOUND)
 diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt
-index 0134f73..8cbc33c 100644
+index 9fd9cb0..7b1f703 100644
 --- a/src/plugins/Input/gme/CMakeLists.txt
 +++ b/src/plugins/Input/gme/CMakeLists.txt
 @@ -9,16 +9,10 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
@@ -51,16 +51,16 @@ index 0134f73..8cbc33c 100644
  
  SET(libgme_SRCS
    decoder_gme.cpp
-@@ -51,6 +45,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -36,6 +30,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR})
  IF(GME_FOUND)
- ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS} ${libgme_UIS_H})
+ ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS})
  add_dependencies(gme libqmmp)
--target_link_libraries(gme Qt5::Widgets libqmmp ${GME_LIB})
-+target_link_libraries(gme Qt5::Widgets libqmmp ${GME_LDFLAGS})
+-target_link_libraries(gme PRIVATE Qt6::Widgets libqmmp ${GME_LIB})
++target_link_libraries(gme PRIVATE Qt6::Widgets libqmmp ${GME_LDFLAGS})
  install(TARGETS gme DESTINATION ${PLUGIN_DIR}/Input)
  ENDIF(GME_FOUND)
 diff --git a/src/plugins/Output/CMakeLists.txt b/src/plugins/Output/CMakeLists.txt
-index 867fe49..3881ec7 100644
+index c423f60..685bda0 100644
 --- a/src/plugins/Output/CMakeLists.txt
 +++ b/src/plugins/Output/CMakeLists.txt
 @@ -10,6 +10,7 @@ SET(USE_DSOUND TRUE CACHE BOOL "enable/disable DirectSound plugin")
@@ -81,7 +81,7 @@ index 867fe49..3881ec7 100644
 +ENDIF(USE_MEDIAKIT)
 diff --git a/src/plugins/Output/mediakit/CMakeLists.txt b/src/plugins/Output/mediakit/CMakeLists.txt
 new file mode 100644
-index 0000000..c1fe674
+index 0000000..73edac6
 --- /dev/null
 +++ b/src/plugins/Output/mediakit/CMakeLists.txt
 @@ -0,0 +1,31 @@
@@ -105,7 +105,7 @@ index 0000000..c1fe674
 +
 +SET(libmediakit_RCCS translations/translations.qrc)
 +
-+QT5_ADD_RESOURCES(libmediakit_RCC_SRCS ${libmediakit_RCCS})
++QT6_ADD_RESOURCES(libmediakit_RCC_SRCS ${libmediakit_RCCS})
 +
 +# Don't forget to include output directory, otherwise
 +# the UI file won't be wrapped!
@@ -114,7 +114,7 @@ index 0000000..c1fe674
 +
 +ADD_LIBRARY(mediakit MODULE ${libmediakit_SRCS} ${libmediakit_UIS_H} ${libmediakit_RCC_SRCS} ${libmediakit_HDRS})
 +add_dependencies(mediakit libqmmp)
-+target_link_libraries(mediakit Qt5::Widgets libqmmp media)
++target_link_libraries(mediakit Qt6::Widgets libqmmp media)
 +install(TARGETS mediakit DESTINATION ${PLUGIN_DIR}/Output)
 diff --git a/src/plugins/Output/mediakit/mediakit.pro b/src/plugins/Output/mediakit/mediakit.pro
 new file mode 100644
@@ -501,26 +501,39 @@ index 0000000..f678c61
 +  </qresource>
 +</RCC>
 diff --git a/src/plugins/Ui/CMakeLists.txt b/src/plugins/Ui/CMakeLists.txt
-index ca25b54..7670cdb 100644
+index 4ca8cbc..7670cdb 100644
 --- a/src/plugins/Ui/CMakeLists.txt
 +++ b/src/plugins/Ui/CMakeLists.txt
 @@ -1,9 +1,9 @@
  SET(USE_SKINNED TRUE CACHE BOOL "enable/disable skinned user interface")
  SET(USE_QSUI TRUE CACHE BOOL "enable/disable simple user interface (qsui)")
  
--IF(USE_SKINNED AND Qt5X11Extras_FOUND)
+-IF(USE_SKINNED AND Qt6BuildInternals_FOUND)
 +IF(USE_SKINNED)
  add_subdirectory(skinned)
--ENDIF(USE_SKINNED AND Qt5X11Extras_FOUND)
+-ENDIF(USE_SKINNED AND Qt6BuildInternals_FOUND)
 +ENDIF(USE_SKINNED)
  
  IF(USE_QSUI)
  add_subdirectory(qsui)
+diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt
+index 133df96..21d15d5 100644
+--- a/src/plugins/Ui/qsui/CMakeLists.txt
++++ b/src/plugins/Ui/qsui/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ project(qsui)
+ 
+ # libqmmpui & libqmmp
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../ ${CMAKE_CURRENT_SOURCE_DIR})
+ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
+ link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
+ 
 diff --git a/src/plugins/Ui/qsui/mainwindow.cpp b/src/plugins/Ui/qsui/mainwindow.cpp
-index 8c51aa2..bca6f64 100644
+index a40b99e..b27d5cd 100644
 --- a/src/plugins/Ui/qsui/mainwindow.cpp
 +++ b/src/plugins/Ui/qsui/mainwindow.cpp
-@@ -320,6 +320,7 @@ void MainWindow::showSettings()
+@@ -321,6 +321,7 @@ void MainWindow::showSettings()
      QSUiSettings *simpleSettings = new QSUiSettings(this);
      confDialog->addPage(tr("Appearance"), simpleSettings, QIcon(":/qsui/qsui_settings.png"));
      confDialog->addPage(tr("Shortcuts"), new HotkeyEditor(this), QIcon(":/qsui/qsui_shortcuts.png"));
@@ -529,10 +542,15 @@ index 8c51aa2..bca6f64 100644
      simpleSettings->writeSettings();
      confDialog->deleteLater();
 diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt
-index 63dc385..f202f88 100644
+index 8f1d99a..be28299 100644
 --- a/src/plugins/Ui/skinned/CMakeLists.txt
 +++ b/src/plugins/Ui/skinned/CMakeLists.txt
-@@ -5,11 +5,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
+@@ -1,15 +1,10 @@
+ project(skinned)
+ 
+ # libqmmpui & libqmmp
+-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../)
++include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../ ${CMAKE_CURRENT_SOURCE_DIR})
  link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui)
  link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp)
  
@@ -544,26 +562,31 @@ index 63dc385..f202f88 100644
  SET(skinned_SRCS
      fft.c
      balancebar.cpp
-@@ -96,10 +91,7 @@ QT5_WRAP_UI(skinned_UIS_H ${skinned_UIS})
- # the UI file won't be wrapped!
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
+@@ -79,14 +74,12 @@ SET(skinned_SRCS
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+ SET(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_AUTOUIC_SEARCH_PATHS} ${CMAKE_CURRENT_SOURCE_DIR}/forms)
  
 -IF(X11_FOUND)
- ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS})
+ ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H})
  add_dependencies(skinned libqmmpui libqmmp)
--target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras libqmmpui libqmmp ${X11_LDFLAGS})
-+target_link_libraries(skinned Qt5::Widgets libqmmpui libqmmp)
+ IF(Qt6Widgets_VERSION VERSION_GREATER_EQUAL 6.2.0)
+-	target_link_libraries(skinned PRIVATE Qt6::Widgets libqmmpui libqmmp ${X11_LDFLAGS})
++	target_link_libraries(skinned PRIVATE Qt6::Widgets libqmmpui libqmmp)
+ ELSE()
+-	target_link_libraries(skinned PRIVATE Qt6::Widgets Qt6::GuiPrivate libqmmpui libqmmp ${X11_LDFLAGS})
++	target_link_libraries(skinned PRIVATE Qt6::Widgets Qt6::GuiPrivate libqmmpui libqmmp)
+ ENDIF()
  install(TARGETS skinned DESTINATION ${PLUGIN_DIR}/Ui)
--install(FILES scripts/kwin.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/scripts)
+ install(FILES scripts/kwin.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/qmmp${APP_NAME_SUFFIX}/scripts)
 -ENDIF(X11_FOUND)
 diff --git a/src/plugins/Ui/skinned/display.cpp b/src/plugins/Ui/skinned/display.cpp
-index 34749d4..d9b0d45 100644
+index 3f89d9f..7ba992e 100644
 --- a/src/plugins/Ui/skinned/display.cpp
 +++ b/src/plugins/Ui/skinned/display.cpp
 @@ -344,7 +344,9 @@ void MainDisplay::mousePressEvent(QMouseEvent *e)
  {
      if (e->button() == Qt::RightButton)
-         m_mw->menu()->exec(e->globalPos());
+         m_mw->menu()->exec(e->globalPosition().toPoint());
 +#ifndef Q_OS_HAIKU
      else if(e->button() == Qt::LeftButton && m_aboutWidget->underMouse())
          m_mw->about();
@@ -583,7 +606,7 @@ index 94afe4f..4bca5ee 100644
      skinnedSettings->writeSettings();
      confDialog->deleteLater();
 diff --git a/src/plugins/Ui/skinned/skinreader.cpp b/src/plugins/Ui/skinned/skinreader.cpp
-index f4fc93f..44fa6e1 100644
+index 89dc58c..c667995 100644
 --- a/src/plugins/Ui/skinned/skinreader.cpp
 +++ b/src/plugins/Ui/skinned/skinreader.cpp
 @@ -50,7 +50,7 @@ void SkinReader::generateThumbs()
@@ -596,7 +619,7 @@ index f4fc93f..44fa6e1 100644
  #else
      dir.setPath(Qmmp::dataPath() + "/skins");
 diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp
-index cc752bb..3683c35 100644
+index 477deca..f411e69 100644
 --- a/src/qmmp/qmmp.cpp
 +++ b/src/qmmp/qmmp.cpp
 @@ -54,6 +54,8 @@ QString Qmmp::configDir()
@@ -606,7 +629,7 @@ index cc752bb..3683c35 100644
 +#elif defined(Q_OS_HAIKU)
 +	return m_configDir.isEmpty() ? QDir::homePath() +"/config/settings/Qmmp/" : m_configDir;
  #else
-     return m_configDir.isEmpty() ? QDir::homePath() +"/.qmmp" : m_configDir;
+     return m_configDir.isEmpty() ? QDir::homePath() + QLatin1String("/.qmmp") : m_configDir;
  #endif
 @@ -86,9 +88,9 @@ QString Qmmp::pluginPath()
      if(!path.isEmpty())
diff --git a/media-sound/qmmp/qmmp-1.5.1.recipe b/media-sound/qmmp/qmmp-2.0.2.recipe
similarity index 90%
rename from media-sound/qmmp/qmmp-1.5.1.recipe
rename to media-sound/qmmp/qmmp-2.0.2.recipe
index 6752e2fb9..5fb0b9254 100644
--- a/media-sound/qmmp/qmmp-1.5.1.recipe
+++ b/media-sound/qmmp/qmmp-2.0.2.recipe
@@ -4,9 +4,9 @@ The user interface is similar to winamp or xmms."
 HOMEPAGE="http://qmmp.ylsoftware.com/"
 COPYRIGHT="2006-2021 Qmmp Development Team"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/1.5/qmmp-$portVersion.tar.bz2"
-CHECKSUM_SHA256="f3dc676039b5f190e6a87377a6b2bd2bcca122d1659b5f22668c7a284bb91f43"
+REVISION="1"
+SOURCE_URI="https://qmmp.ylsoftware.com/files/qmmp/2.0/qmmp-$portVersion.tar.bz2"
+CHECKSUM_SHA256="fc41cf37040f583de8be43d7154d1bd6221fcd445d0fd880e31ec899787f433a"
 PATCHES="qmmp-$portVersion.patchset"
 ADDITIONAL_FILES="
 	qmmp.rdef.in
@@ -52,9 +52,9 @@ REQUIRES="
 	lib:libogg$secondaryArchSuffix
 	lib:libopus$secondaryArchSuffix
 	lib:libopusfile$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt6Core$secondaryArchSuffix
+	lib:libQt6Gui$secondaryArchSuffix
+	lib:libQt6Widgets$secondaryArchSuffix
 	lib:libsidplayfp$secondaryArchSuffix
 	lib:libsndfile$secondaryArchSuffix
 	lib:libsoxr$secondaryArchSuffix
@@ -75,6 +75,7 @@ REQUIRES_devel="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	qt6_tools${secondaryArchSuffix}_devel
 	devel:libarchive$secondaryArchSuffix
 	devel:libavcodec$secondaryArchSuffix
 	devel:libavformat$secondaryArchSuffix
@@ -99,7 +100,9 @@ BUILD_REQUIRES="
 	devel:libogg$secondaryArchSuffix
 	devel:libopus$secondaryArchSuffix
 	devel:libopusfile$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix >= 5.15
+	devel:libQt6Core$secondaryArchSuffix
+	devel:libQt6Gui$secondaryArchSuffix
+	devel:libQt6Widgets$secondaryArchSuffix
 	devel:libsidplayfp$secondaryArchSuffix
 	devel:libsndfile$secondaryArchSuffix
 	devel:libsoxr$secondaryArchSuffix
@@ -113,10 +116,9 @@ BUILD_PREREQUIRES="
 	cmd:find
 	cmd:flex
 	cmd:gcc$secondaryArchSuffix
-	cmd:lrelease$secondaryArchSuffix >= 5
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:qmake$secondaryArchSuffix >= 5
+	cmd:qmake6$secondaryArchSuffix
 	cmd:unzip
 	cmd:xargs
 	cmd:yacc
@@ -143,7 +145,7 @@ BUILD()
 		-DUSE_LADSPA=OFF \
 		-DUSE_MEDIAKIT=ON \
 		-DUSE_MPRIS=OFF \
-		-DUSE_QTMULTIMEDIA=ON \
+		-DUSE_QTMULTIMEDIA=OFF \
 		-DUSE_SKINNED=ON \
 		-DUSE_UDISKS2=OFF