diff --git a/autospec/failed_commands b/autospec/failed_commands
index 581db016..2ddb6377 100644
--- a/autospec/failed_commands
+++ b/autospec/failed_commands
@@ -778,7 +778,7 @@ debtcollector, debtcollector
 decorator, pypi-decorator
 deflate, zlib-dev
 deflateBound in -lz, zlib-dev
-designer, qttools-dev
+designer, qt6tools-dev
 desktop-file-install, desktop-file-utils
 desktop-file-validate, desktop-file-utils
 dialog, dialog
@@ -979,7 +979,7 @@ lber.h, openldap-dev
 lcms2, lcms2-dev
 lcms2.h, lcms2-dev
 lcms2/lcms2.h, lcms2-dev
-lconvert, qttools-dev
+lconvert, qt6tools-dev
 ldap.h, openldap-dev
 ldap_parse_sort_control, openldap-dev
 ldap_search in -lldap, openldap-dev
@@ -1065,14 +1065,14 @@ libxml2 devel libraries, libxml2-dev
 libxml2 library, libxml2-dev
 libxslt/pattern.h, libxslt-dev
 libz, zlib-dev
-linguist, qttools-dev
+linguist, qt6tools-dev
 linux/xattr.h, attr-dev
 llvm-config, llvm-dev
 loadkeys, kbd
-lrelease, qttools-dev
+lrelease, qt6tools-dev
 ltdl.h, libtool-dev
 lua, lua-dev
-lupdate, qttools-dev
+lupdate, qt6tools-dev
 lvm2app.h, LVM2-dev
 lxml, pypi-lxml
 lxqt, liblxqt-dev
@@ -1194,7 +1194,7 @@ pg_config, postgresql-dev
 php, php
 php-config7, php
 pip, pypi-pip
-pixeltool, qttools-dev
+pixeltool, qt6tools-dev
 pixman, pkgconfig(pixman-1)
 pkg-config, pkg-config
 pkg.m4, pkg-config-dev
@@ -1232,11 +1232,11 @@ python-pcre, python-pcre
 python-subunit, pypi(python_subunit)
 pytz, pypi(pytz)
 pyyaml, PyYAML
-qcollectiongenerator, qttools-dev
+qcollectiongenerator, qt6tools-dev
 qdbuscpp2xml, qtbase-dev
 qdbusxml2cpp, qtbase-dev
-qhelpconverter, qttools-dev
-qhelpgenerator, qttools-dev
+qhelpconverter, qt6tools-dev
+qhelpgenerator, qt6tools-dev
 qhull/libqhull.h, qhull-dev
 qjson/parser.h, qjson-dev
 qlalr, qtbase-dev
@@ -1250,8 +1250,8 @@ qmlplugindump, qtdeclarative-dev
 qmltestrunner, qtdeclarative-dev
 qscxmlc, qtscxml-dev
 qt5, buildreq-kde
-qtattributionsscanner, qttools-dev
-qtplugininfo, qttools-dev
+qtattributionsscanner, qt6tools-dev
+qtplugininfo, qt6tools-dev
 qtwaylandscanner, qtwayland-dev
 qvkgen, qtbase-dev
 raptor, raptor2-dev
diff --git a/autospec/qt_modules b/autospec/qt_modules
index 5ff1314d..5720ed3f 100644
--- a/autospec/qt_modules
+++ b/autospec/qt_modules
@@ -2,67 +2,67 @@
 # pkgconfig equivalent, to be added to BuildRequires. Please keep sorted.
 # This file is sorted with LC_COLLATE=C
 # Format: <qmake key>, <pkgconfig value>
-3danimation, Qt53DAnimation
-3dcore, Qt53DCore
-3dextras, Qt53DExtras
-3dinput, Qt53DInput
-3dlogic, Qt53DLogic
-3dquick, Qt53DQuick
-3dquickanimation, Qt53DQuickAnimation
-3dquickextras, Qt53DQuickExtras
-3dquickinput, Qt53DQuickInput
-3dquickrender, Qt53DQuickRender
-3dquickscene2d, Qt53DQuickScene2D
-3drender, Qt53DRender
-bluetooth, Qt5Bluetooth
-charts, Qt5Charts
-concurrent, Qt5Concurrent
-core, Qt5Core
-datavisualization, Qt5DataVisualization
-dbus, Qt5DBus
-declarative, Qt5Declarative
-designer, Qt5Designer
-gamepad, Qt5Gamepad
-gui, Qt5Gui
-help, Qt5Help
-location, Qt5Location
-multimedia, Qt5Multimedia
-multimediawidgets, Qt5MultimediaWidgets
-network, Qt5Network
-networkauth, Qt5NetworkAuth
-nfc, Qt5Nfc
-opengl, Qt5OpenGL
-openglextensions, Qt5OpenGLExtensions
-positioning, Qt5Positioning
-printsupport, Qt5PrintSupport
-purchasing, Qt5Purchasing
-qml, Qt5Qml
-qmltest, Qt5QuickTest
-quick, Qt5Quick
-quickcontrols2, Qt5QuickControls2
-quickwidgets, Qt5QuickWidgets
-remoteobjects, Qt5RemoteObjects
-script, Qt5Script
-scripttools, Qt5ScriptTools
-scxml, Qt5Scxml
-sensors, Qt5Sensors
-serialbus, Qt5SerialBus
-serialport, Qt5SerialPort
-sql, Qt5Sql
-svg, Qt5Svg
-testlib, Qt5Test
-texttospeech, Qt5TextToSpeech
-uitools, Qt5UiTools
-waylandclient, Qt5WaylandClient
-waylandcompositor, Qt5WaylandCompositor
-webchannel, Qt5WebChannel
-webengine, Qt5WebEngine
-webenginecore, Qt5WebEngineCore
-webenginewidgets, Qt5WebEngineWidgets
-webkit, Qt5WebKit
-webkitwidgets, Qt5WebKitWidgets
-websockets, Qt5WebSockets
-widgets, Qt5Widgets
-x11extras, Qt5X11Extras
-xml, Qt5Xml
-xmlpatterns, Qt5XmlPatterns
+3danimation, Qt63DAnimation
+3dcore, Qt63DCore
+3dextras, Qt63DExtras
+3dinput, Qt63DInput
+3dlogic, Qt63DLogic
+3dquick, Qt63DQuick
+3dquickanimation, Qt63DQuickAnimation
+3dquickextras, Qt63DQuickExtras
+3dquickinput, Qt63DQuickInput
+3dquickrender, Qt63DQuickRender
+3dquickscene2d, Qt63DQuickScene2D
+3drender, Qt63DRender
+bluetooth, Qt6Bluetooth
+charts, Qt6Charts
+concurrent, Qt6Concurrent
+core, Qt6Core
+datavisualization, Qt6DataVisualization
+dbus, Qt6DBus
+declarative, Qt6Declarative
+designer, Qt6Designer
+gamepad, Qt6Gamepad
+gui, Qt6Gui
+help, Qt6Help
+location, Qt6Location
+multimedia, Qt6Multimedia
+multimediawidgets, Qt6MultimediaWidgets
+network, Qt6Network
+networkauth, Qt6NetworkAuth
+nfc, Qt6Nfc
+opengl, Qt6OpenGL
+openglextensions, Qt6OpenGLExtensions
+positioning, Qt6Positioning
+printsupport, Qt6PrintSupport
+purchasing, Qt6Purchasing
+qml, Qt6Qml
+qmltest, Qt6QuickTest
+quick, Qt6Quick
+quickcontrols2, Qt6QuickControls2
+quickwidgets, Qt6QuickWidgets
+remoteobjects, Qt6RemoteObjects
+script, Qt6Script
+scripttools, Qt6ScriptTools
+scxml, Qt6Scxml
+sensors, Qt6Sensors
+serialbus, Qt6SerialBus
+serialport, Qt6SerialPort
+sql, Qt6Sql
+svg, Qt6Svg
+testlib, Qt6Test
+texttospeech, Qt6TextToSpeech
+uitools, Qt6UiTools
+waylandclient, Qt6WaylandClient
+waylandcompositor, Qt6WaylandCompositor
+webchannel, Qt6WebChannel
+webengine, Qt6WebEngine
+webenginecore, Qt6WebEngineCore
+webenginewidgets, Qt6WebEngineWidgets
+webkit, Qt6WebKit
+webkitwidgets, Qt6WebKitWidgets
+websockets, Qt6WebSockets
+widgets, Qt6Widgets
+x11extras, Qt6X11Extras
+xml, Qt6Xml
+xmlpatterns, Qt6XmlPatterns