diff --git a/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild b/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild
index 18820ef..463da70 100644
--- a/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild
+++ b/lxqt-base/liblxqt/liblxqt-0.11.1.ebuild
@@ -11,8 +11,8 @@ 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"
-	KEYWORDS="~amd64 ~arm ~arm64 x86"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
diff --git a/lxqt-base/libsysstat/libsysstat-0.3.3.ebuild b/lxqt-base/libsysstat/libsysstat-0.3.3.ebuild
index 11e80fa..0a231e4 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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 3a0a04b..18a3055 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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 44525ef..9aab908 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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 d661380..a833514 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/lxqt/${PV}/${P}.tar.xz"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+SRC_URI="https://downloads.lxqt.org/downloads/${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 5869e0f..0b26b6e 100644
--- a/lxqt-base/lxqt-config/lxqt-config-0.11.1.ebuild
+++ b/lxqt-base/lxqt-config/lxqt-config-0.11.1.ebuild
@@ -11,8 +11,8 @@ 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"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
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 d56abb8..bb96fce 100644
--- a/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.1.ebuild
+++ b/lxqt-base/lxqt-globalkeys/lxqt-globalkeys-0.11.1.ebuild
@@ -5,13 +5,13 @@ EAPI=6
 inherit cmake-utils versionator
 
 DESCRIPTION="Daemon and library for global keyboard shortcuts registration"
-HOMEPAGE="http://lxqt.org/"
+HOMEPAGE="https://lxqt.org/"
 
 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/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.2.ebuild b/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild
similarity index 74%
rename from lxqt-base/lxqt-l10n/lxqt-l10n-0.11.2.ebuild
rename to lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild
index 9d1b72e..ecea22b 100644
--- a/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.2.ebuild
+++ b/lxqt-base/lxqt-l10n/lxqt-l10n-0.11.99.ebuild
@@ -5,13 +5,13 @@ EAPI=6
 inherit cmake-utils versionator
 
 DESCRIPTION="LXQt localisation package"
-HOMEPAGE="http://lxqt.org/"
+HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 0c5e016..6a80bb6 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 e665583..366f3fe 100644
--- a/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.1.ebuild
+++ b/lxqt-base/lxqt-notificationd/lxqt-notificationd-0.11.1.ebuild
@@ -9,9 +9,9 @@ HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 a2eb0e1..e883d42 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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 102909c..2bc9034 100644
--- a/lxqt-base/lxqt-panel/lxqt-panel-0.11.1.ebuild
+++ b/lxqt-base/lxqt-panel/lxqt-panel-0.11.1.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="LGPL-2.1+"
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 79715ca..6549b48 100644
--- a/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.1.ebuild
+++ b/lxqt-base/lxqt-policykit/lxqt-policykit-0.11.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,10 +9,10 @@ HOMEPAGE="https://lxqt.org/"
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2 LGPL-2.1+"
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 954d7cc..8d766cf 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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 b89c4fe..20694dd 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://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
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 085f7c9..a2b3a82 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://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${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 e023899..faed864 100644
--- a/lxqt-base/lxqt-session/lxqt-session-0.11.1.ebuild
+++ b/lxqt-base/lxqt-session/lxqt-session-0.11.1.ebuild
@@ -2,7 +2,6 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 inherit cmake-utils versionator
 
 DESCRIPTION="LXQT session manager"
@@ -14,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
-	SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
diff --git a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild b/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild
deleted file mode 100644
index b709bb8..0000000
--- a/lxqt-base/lxqt-sudo/lxqt-sudo-0.11.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="LXQt GUI frontend for sudo"
-HOMEPAGE="http://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://git.lxde.org/git/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/lxqt/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-
-DEPEND="app-admin/sudo
-	>=dev-libs/libqtxdg-1.0.0
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	~lxqt-base/liblxqt-${PV}
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=( -DPULL_TRANSLATIONS=OFF )
-	cmake-utils_src_configure
-}
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 aee96ab..7a7d6f4 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://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+	SRC_URI="https://downloads.lxqt.org/downloads/${PV}/${P}.tar.xz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
 
 src_configure() {
 	local mycmakeargs=(
-		-DWITH_LIBUDEV=$(usex udev)
 		-DPULL_TRANSLATIONS=OFF
 	)
 	cmake-utils_src_configure
diff --git a/x11-misc/obconf-qt/Manifest b/x11-misc/obconf-qt/Manifest
new file mode 100644
index 0000000..5ace28c
--- /dev/null
+++ b/x11-misc/obconf-qt/Manifest
@@ -0,0 +1,2 @@
+DIST obconf-qt-0.12.0.tar.xz 33996 BLAKE2B d1960aa070ec56a3e42e5d1ae190be64356c5bcd36bfcd9dbc51aab5db7d8b4e35a19ff0649208846ef4c5d1feda6e5cde6417ad42a7882556cb2da0a5bad85e SHA512 087d453d111c4aa5e9be7e03b1253192bf8c274bbee822f0c9bc9375fef79763c48cba0096ce153b1da3a6fe59429d228ffe3611746cfa20d0193232768f372e
+DIST obconf-qt-0.9.0_p20150729.tar.gz 96660 BLAKE2B dea66b2bd4084ecd5936612bb52cee1395866d7b4b3b3f211abfa60bd5b4318cc6e31b04867dd600caec5347cb38bad5be854be1e1051bd232b4f4328a8d3121 SHA512 cb4318608fb49926212130de368b059af34c9731d5edf19fca4b05f583ec0d37ce7568f95a5a3f1533642503fd3c7f03fee65ca96796cbc0bb16e92f9890efe3
diff --git a/x11-misc/obconf-qt/metadata.xml b/x11-misc/obconf-qt/metadata.xml
new file mode 100644
index 0000000..08d5c58
--- /dev/null
+++ b/x11-misc/obconf-qt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>lxqt@gentoo.org</email>
+		<name>LXQt</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">lxqt/obconf-qt</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
new file mode 100644
index 0000000..648f457
--- /dev/null
+++ b/x11-misc/obconf-qt/obconf-qt-0.11.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Openbox window manager configuration tool"
+HOMEPAGE="https://lxqt.org/"
+
+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"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RDEPEND="
+	dev-libs/glib:2
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-wm/openbox:3
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	>=dev-util/lxqt-build-tools-0.1.0
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DPULL_TRANSLATIONS=OFF
+	)
+	cmake-utils_src_configure
+}