diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.3.2.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.3.2.ebuild
index d5a7162..ece5544 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.3.2.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.3.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild
index 463da70..fb7e043 100644
--- a/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/libsysstat/libsysstat-0.3.3.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.3.ebuild
index 0a231e4..3969c1c 100644
--- a/lxqt-base/libsysstat/libsysstat-0.3.3.ebuild
+++ b/lxqt-base/libsysstat/libsysstat-0.3.3.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-about/lxqt-about-0.11.1.ebuild b/lxqt-base/lxqt-about/lxqt-about-0.11.1.ebuild
index 18a3055..437ee8f 100644
--- a/lxqt-base/lxqt-about/lxqt-about-0.11.1.ebuild
+++ b/lxqt-base/lxqt-about/lxqt-about-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-admin/lxqt-admin-0.11.1.ebuild b/lxqt-base/lxqt-admin/lxqt-admin-0.11.1.ebuild
index 9aab908..1a37487 100644
--- a/lxqt-base/lxqt-admin/lxqt-admin-0.11.1.ebuild
+++ b/lxqt-base/lxqt-admin/lxqt-admin-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-common/lxqt-common-0.11.2.ebuild b/lxqt-base/lxqt-common/lxqt-common-0.11.2.ebuild
index a833514..5ce9f12 100644
--- a/lxqt-base/lxqt-common/lxqt-common-0.11.2.ebuild
+++ b/lxqt-base/lxqt-common/lxqt-common-0.11.2.ebuild
@@ -7,8 +7,8 @@ inherit cmake-utils
 DESCRIPTION="LXQt common resources"
 HOMEPAGE="https://lxqt.org/"
 
-SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
diff --git a/lxqt-base/lxqt-config/lxqt-config-0.11.1.ebuild b/lxqt-base/lxqt-config/lxqt-config-0.11.1.ebuild
index 0b26b6e..dc3ff36 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.11.1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.1.ebuild b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.1.ebuild
index bb96fce..fc5c1ac 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild
index ecea22b..a2c749d 100644
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild
+++ b/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild b/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild
index 6a80bb6..8c29b15 100644
--- a/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild
+++ b/lxqt-base/lxqt-meta/lxqt-meta-0.11.1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://lxqt.org/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="+about admin +filemanager +icons lightdm lximage minimal +oxygen +policykit
 	powermanagement sddm ssh-askpass sudo"
 REQUIRED_USE="oxygen? ( icons )"
diff --git a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.1.ebuild b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.1.ebuild
index 366f3fe..2ace7ab 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.1.ebuild b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.1.ebuild
index e883d42..c2fae0f 100644
--- a/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.1.ebuild
+++ b/lxqt-base/lxqt-openssh-askpass/lxqt-openssh-askpass-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-panel/lxqt-panel-0.11.1.ebuild b/lxqt-base/lxqt-panel/lxqt-panel-0.11.1.ebuild
index 2bc9034..c2df74a 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.11.1.ebuild
@@ -2,16 +2,18 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit cmake-utils
+inherit cmake-utils versionator
 
 DESCRIPTION="LXQt desktop panel and plugins"
 HOMEPAGE="https://lxqt.org/"
 
+MY_PV="$(get_version_component_range 1-2)*"
+
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
@@ -33,8 +35,8 @@ CDEPEND="
 	kde-frameworks/kguiaddons:5
 	kde-frameworks/kwindowsystem:5[X]
 	>=lxde-base/menu-cache-0.3.3
-	~lxqt-base/liblxqt-${PV}
-	~lxqt-base/lxqt-globalkeys-${PV}
+	=lxqt-base/liblxqt-${MY_PV}
+	=lxqt-base/lxqt-globalkeys-${MY_PV}
 	x11-libs/libX11
 	cpuload? ( sys-libs/libstatgrab )
 	kbindicator? ( x11-libs/libxkbcommon )
diff --git a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.1.ebuild b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.1.ebuild
index 6549b48..9573a25 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.1.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.1.ebuild b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.1.ebuild
index 8d766cf..fb54636 100644
--- a/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.1.ebuild
+++ b/lxqt-base/lxqt-powermanagement/lxqt-powermanagement-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.1.ebuild b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.1.ebuild
index 20694dd..278d16b 100644
--- a/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.1.ebuild
+++ b/lxqt-base/lxqt-qtplugin/lxqt-qtplugin-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
@@ -19,7 +19,7 @@ LICENSE="LGPL-2.1+"
 SLOT="0"
 
 RDEPEND="
-	dev-libs/libdbusmenu-qt:=[qt5(+)]
+	dev-libs/libdbusmenu-qt:=
 	>=dev-libs/libqtxdg-2.0.0
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
diff --git a/lxqt-base/lxqt-runner/lxqt-runner-0.11.1.ebuild b/lxqt-base/lxqt-runner/lxqt-runner-0.11.1.ebuild
index a2b3a82..259dab5 100644
--- a/lxqt-base/lxqt-runner/lxqt-runner-0.11.1.ebuild
+++ b/lxqt-base/lxqt-runner/lxqt-runner-0.11.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-session/lxqt-session-0.11.1.ebuild b/lxqt-base/lxqt-session/lxqt-session-0.11.1.ebuild
index faed864..e599678 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.11.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.11.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.1.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.1.ebuild
index 7a7d6f4..da545b0 100644
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.1.ebuild
+++ b/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-sudo/metadata.xml b/lxqt-base/lxqt-sudo/metadata.xml
index 64b8fa1..34a55e6 100644
--- a/lxqt-base/lxqt-sudo/metadata.xml
+++ b/lxqt-base/lxqt-sudo/metadata.xml
@@ -6,6 +6,6 @@
 		<name>LXQt</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="github">lxde/lxqt-sudo</remote-id>
+		<remote-id type="github">lxqt/lxqt-sudo</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/x11-misc/obconf-qt/obconf-qt-0.11.1.ebuild b/x11-misc/obconf-qt/obconf-qt-0.11.1.ebuild
index 648f457..80dabe8 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.11.1.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.11.1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi