diff --git a/kaccounts-integration/kaccounts-integration.spec b/kaccounts-integration/kaccounts-integration.spec
index 9e9c106..098c9c1 100644
--- a/kaccounts-integration/kaccounts-integration.spec
+++ b/kaccounts-integration/kaccounts-integration.spec
@@ -31,19 +31,11 @@ Recommends:     kaccounts-providers
 Small system to administer web accounts for the sites and services across the
 Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
 
-%package -n libkaccounts6-2
-Summary:        KDE Accounts Providers - System Library
-Recommends:     kaccounts-integration
-
-%description -n libkaccounts6-2
-Small system to administer web accounts for the sites and services across the
-Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
-
 %package devel
 Summary:        KDE Accounts Providers - Development Files
 # Used in KAccountsMacros.cmake
 Requires:       intltool
-Requires:       libkaccounts6-2 = %{version}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 Requires:       cmake(AccountsQt6)
 Requires:       cmake(KF6CoreAddons) >= %{kf6_version}
 Requires:       cmake(Qt6Widgets) >= %{qt6_version}
@@ -55,8 +47,6 @@ Small system to administer web accounts for the sites and services across the
 Plasma desktop, including: Google, Facebook, Owncloud, IMAP, Jabber and others.
 This package provides development files.
 
-%lang_package
-
 %prep
 %autosetup -p1
 
@@ -68,13 +58,22 @@ This package provides development files.
 %install
 %kf6_install
 
-%find_lang %{name} --with-man --all-name
+# todo: fix the name error.
+# Avoid illegal package names
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*@*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en_GB/
+rm -rf $RPM_BUILD_ROOT%{_mandir}/*@*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/en_GB/
+# Use langpacks macro to auto-split translations
+%find_lang %{name} --with-qt --with-man --all-name --generate-subpackages
 
-%ldconfig_scriptlets -n libkaccounts6-2
+%ldconfig_scriptlets
 
 %files
+%license LICENSES/*
 %{_kf6_applicationsdir}/kcm_kaccounts.desktop
 %{_kf6_debugdir}/kaccounts.categories
+%{_kf6_libdir}/libkaccounts6.so.*
 %dir %{_kf6_plugindir}/kaccounts
 %dir %{_kf6_plugindir}/kaccounts/daemonplugins
 %{_kf6_plugindir}/kaccounts/daemonplugins/kaccounts_kio_webdav_plugin.so
@@ -82,15 +81,9 @@ This package provides development files.
 %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_kaccounts.so
 %{_kf6_qmldir}/org/kde/kaccounts/
 
-%files -n libkaccounts6-2
-%license LICENSES/*
-%{_kf6_libdir}/libkaccounts6.so.*
-
 %files devel
 %{_includedir}/KAccounts6/
 %{_kf6_cmakedir}/KAccounts6/
 %{_kf6_libdir}/libkaccounts6.so
 
-%files lang -f %{name}.lang
-
 %changelog
diff --git a/plasma6-firewall/plasma6-firewall.spec b/plasma6-firewall/plasma6-firewall.spec
index 0b0e14e..3eadfb1 100644
--- a/plasma6-firewall/plasma6-firewall.spec
+++ b/plasma6-firewall/plasma6-firewall.spec
@@ -44,8 +44,6 @@ Obsoletes:      plasma5-firewall-lang < %{version}
 %description
 Config Module for the System Firewall
 
-%lang_package
-
 %prep
 %autosetup -p1 -n %{rname}-%{version}
 
@@ -59,7 +57,12 @@ Config Module for the System Firewall
 
 %fdupes %{buildroot}
 
-%find_lang kcm_firewall %{name}.lang
+# todo: fix the name error.
+# Avoid illegal package names
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/*@*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/locale/en_GB/
+# Use langpacks macro to auto-split translations
+%find_lang kcm_firewall --with-qt --all-name --generate-subpackages
 
 %files
 %license LICENSES/*
@@ -71,6 +74,4 @@ Config Module for the System Firewall
 %{_kf6_plugindir}/kf6/plasma_firewall/firewalldbackend.so
 %{_kf6_plugindir}/plasma/kcms/systemsettings/kcm_firewall.so
 
-%files lang -f %{name}.lang
-
 %changelog