diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index cb385ea21..abf55da72 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -112,10 +112,9 @@ BDEPEND="
 if [[ ${PN} != qttest ]]; then
 	DEPEND+=" test? ( ~dev-qt/qttest-${PV} )"
 fi
-RDEPEND="
-	dev-qt/qtchooser
-"
-
+if ver_test ${PV} -lt 5.15.1; then
+	RDEPEND="dev-qt/qtchooser"
+fi
 
 ######  Phase functions  ######
 
@@ -258,22 +257,24 @@ qt5-build_src_install() {
 			"${D}${QT5_HEADERDIR}"/QtCore/qconfig.h \
 			|| die "sed failed (qconfig.h)"
 
-		# install qtchooser configuration file
-		cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
-			${QT5_BINDIR}
-			${QT5_LIBDIR}
-		_EOF_
-
-		(
-			insinto /etc/xdg/qtchooser
-			doins "${T}/qt5-${CHOST}.conf"
-		)
-
-		# convenience symlinks
-		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
-		dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
-		# TODO bug 522646: write an eselect module to manage default.conf
-		dosym qt5.conf /etc/xdg/qtchooser/default.conf
+		if ver_test ${PV} -lt 5.15.1; then
+			# install qtchooser configuration file
+			cat > "${T}/qt5-${CHOST}.conf" <<-_EOF_ || die
+				${QT5_BINDIR}
+				${QT5_LIBDIR}
+			_EOF_
+
+			(
+				insinto /etc/xdg/qtchooser
+				doins "${T}/qt5-${CHOST}.conf"
+			)
+
+			# convenience symlinks
+			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/5.conf
+			dosym qt5-"${CHOST}".conf /etc/xdg/qtchooser/qt5.conf
+			# TODO bug 522646: write an eselect module to manage default.conf
+			dosym qt5.conf /etc/xdg/qtchooser/default.conf
+		fi
 	fi
 
 	qt5_install_module_config