diff --git a/krita.spec b/krita.spec
index b9a26df..2adb919 100644
--- a/krita.spec
+++ b/krita.spec
@@ -17,14 +17,12 @@
 
 
 %bcond_without lang
-
 # Enable VC only on x86*
-%ifarch %ix86 x86_64
+%ifarch %{ix86} x86_64
 %bcond_without vc
 %else
 %bcond_with vc
 %endif
-
 Name:           krita
 Version:        4.2.0
 Release:        0
@@ -35,24 +33,10 @@ URL:            https://www.krita.org/
 Source0:        https://download.kde.org/stable/krita/%{version}/krita-%{version}.tar.xz
 BuildRequires:  OpenColorIO-devel
 BuildRequires:  OpenEXR-devel
-%if %{with vc}
-BuildRequires:  Vc-devel-static
-%endif
 BuildRequires:  extra-cmake-modules
 BuildRequires:  fftw3-devel
 BuildRequires:  giflib-devel
 BuildRequires:  gsl-devel
-BuildRequires:  karchive-devel
-BuildRequires:  kcompletion-devel
-BuildRequires:  kconfig-devel
-BuildRequires:  kcoreaddons-devel
-BuildRequires:  kcrash-devel
-BuildRequires:  kguiaddons-devel
-BuildRequires:  ki18n-devel
-BuildRequires:  kitemmodels-devel
-BuildRequires:  kitemviews-devel
-BuildRequires:  kwidgetsaddons-devel
-BuildRequires:  kwindowsystem-devel
 BuildRequires:  libboost_system-devel
 BuildRequires:  libeigen3-devel
 BuildRequires:  libexiv2-devel
@@ -64,31 +48,46 @@ BuildRequires:  libquazip-qt5-devel
 BuildRequires:  libraw-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  perl
+BuildRequires:  pkgconfig
 BuildRequires:  python3-devel
 BuildRequires:  python3-qt5-devel
 BuildRequires:  python3-sip-devel
 BuildRequires:  update-desktop-files
 BuildRequires:  zlib-devel
-BuildRequires:  pkgconfig(Qt5Concurrent)
-BuildRequires:  pkgconfig(Qt5Core) >= 5.9
-BuildRequires:  pkgconfig(Qt5DBus)
-BuildRequires:  pkgconfig(Qt5Gui)
-BuildRequires:  pkgconfig(Qt5Multimedia)
-BuildRequires:  pkgconfig(Qt5Network)
-BuildRequires:  pkgconfig(Qt5PrintSupport)
-BuildRequires:  pkgconfig(Qt5Qml)
-BuildRequires:  pkgconfig(Qt5Quick)
-BuildRequires:  pkgconfig(Qt5Svg)
-BuildRequires:  pkgconfig(Qt5Test)
-BuildRequires:  pkgconfig(Qt5Widgets)
-BuildRequires:  pkgconfig(Qt5X11Extras)
-BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  cmake(KF5Archive)
+BuildRequires:  cmake(KF5Completion)
+BuildRequires:  cmake(KF5Config)
+BuildRequires:  cmake(KF5Coreaddons)
+BuildRequires:  cmake(KF5Crash)
+BuildRequires:  cmake(KF5GuiAddons)
+BuildRequires:  cmake(KF5I18n)
+BuildRequires:  cmake(KF5ItemModels)
+BuildRequires:  cmake(KF5Itemviews)
+BuildRequires:  cmake(KF5WidgetsAddons)
+BuildRequires:  cmake(KF5WindowSystem)
+BuildRequires:  cmake(Qt5Concurrent)
+BuildRequires:  cmake(Qt5Core) >= 5.9
+BuildRequires:  cmake(Qt5DBus)
+BuildRequires:  cmake(Qt5Gui)
+BuildRequires:  cmake(Qt5Multimedia)
+BuildRequires:  cmake(Qt5Network)
+BuildRequires:  cmake(Qt5PrintSupport)
+BuildRequires:  cmake(Qt5Qml)
+BuildRequires:  cmake(Qt5Quick)
+BuildRequires:  cmake(Qt5Svg)
+BuildRequires:  cmake(Qt5Test)
+BuildRequires:  cmake(Qt5Widgets)
+BuildRequires:  cmake(Qt5X11Extras)
+BuildRequires:  cmake(Qt5Xml)
 BuildRequires:  pkgconfig(xcb-atom)
 BuildRequires:  pkgconfig(xi) >= 1.4.99.1
 Recommends:     %{name}-lang = %{version}
 Recommends:     python3-qt5
 Obsoletes:      calligra-krita < %{version}
 Provides:       calligra-krita = %{version}
+%if %{with vc}
+BuildRequires:  Vc-devel-static
+%endif
 
 %description
 Krita is a painting program. It supports concept art, texture and
@@ -114,7 +113,7 @@ Development headers and libraries for Krita.
 %make_jobs
 
 %install
-%kf5_makeinstall -C build 
+%kf5_makeinstall -C build
 %suse_update_desktop_file -r org.kde.krita      Qt KDE Graphics RasterGraphics
 %if %{with lang}
 %kf5_find_lang %{name}