diff --git a/kf5.spec b/kf5.spec
index d0fe8d0..b3ac5d8 100644
--- a/kf5.spec
+++ b/kf5.spec
@@ -1,5 +1,5 @@
 Name:           kf5
-Version:        5.21.0
+Version:        5.22.0
 Release:        1%{?dist}
 Summary:        Filesystem and RPM macros for KDE Frameworks 5
 License:        BSD
@@ -69,6 +69,10 @@ sed -i \
 
 
 %changelog
+* Mon May 09 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.22.0-1
+- KDE Frameworks 5.22.0
+- rpm-macros: update to use -DKDE_INSTALL_... style definitions
+
 * Mon Apr 04 2016 Rex Dieter <rdieter@fedoraproject.org> - 5.21.0-1
 - KDE Frameworks 5.21.0
 
diff --git a/macros.kf5 b/macros.kf5
index 0ad17ba..7241d3b 100644
--- a/macros.kf5
+++ b/macros.kf5
@@ -25,28 +25,21 @@
     -DBUILD_SHARED_LIBS:BOOL=ON \\\
     -DBUILD_TESTING:BOOL=FALSE \\\
     -DCMAKE_BUILD_TYPE=%{_kf5_buildtype} \\\
+    -DCMAKE_INSTALL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\
     -DCMAKE_INSTALL_PREFIX:PATH=%{_kf5_prefix} \\\
-    -DCMAKE_INSTALL_FULL_BINDIR=%{_kf5_bindir} \\\
-    -DCMAKE_INSTALL_FULL_LIBEXECDIR=%{_libexecdir} \\\
-    -DCMAKE_INSTALL_FULL_LIBEXECDIR_KF5=%{_kf5_libexecdir} \\\
     -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON \\\
     -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-    -DBIN_INSTALL_DIR:PATH=%{_kf5_bindir} \\\
-    -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-    -DLIB_INSTALL_DIR:PATH=%{_lib} \\\
-%if "%{?_lib}" == "lib64" \
-     %{?_cmake_lib_suffix64} \\\
-%endif \
-    -DKCFG_INSTALL_DIR:PATH=%{_datadir}/config.kcfg \\\
-    -DPLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\
-    -DQT_PLUGIN_INSTALL_DIR:PATH=%{_qt5_plugindir} \\\
-    -DQML_INSTALL_DIR:PATH=%{_kf5_qmldir} \\\
-    -DIMPORTS_INSTALL_DIR:PATH=%{_qt5_importdir} \\\
-    -DECM_MKSPECS_INSTALL_DIR:PATH=%{_kf5_libdir}/qt5/mkspecs/modules \\\
-    -DSYSCONF_INSTALL_DIR:PATH=%{_kf5_sysconfdir} \\\
-    -DLIBEXEC_INSTALL_DIR:PATH=%{_libexecdir} \\\
-    -DKF5_LIBEXEC_INSTALL_DIR=%{_kf5_libexecdir} \\\
-    -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} \\\
+    -DECM_MKSPECS_INSTALL_DIR:PATH=%{_qt5_archdatadir}/qt5/mkspecs/modules \\\
+    -DKDE_INSTALL_BINDIR:PATH=%{_kf5_bindir} \\\
+    -DKDE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \\\
+    -DKDE_INSTALL_KCFGDIR:PATH=%{_datadir}/config.kcfg \\\
+    -DKDE_INSTALL_LIBDIR:PATH=%{_kf5_libdir} \\\
+    -DKDE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \\\
+    -DKDE_INSTALL_PLUGINDIR:PATH=%{_qt5_plugindir} \\\
+    -DKDE_INSTALL_QMLDIR:PATH=%{_kf5_qmldir} \\\
+    -DKDE_INSTALL_QTPLUGINDIR:PATH=%{_qt5_plugindir} \\\
+    -DKDE_INSTALL_QTQUICKIMPORTSDIR:PATH=%{_qt5_importdir} \\\
+    -DKDE_INSTALL_SYSCONFDIR:PATH=%{_kf5_sysconfdir} \\\
     -DKDE_INSTALL_USE_QT_SYS_PATHS:BOOL=ON
 
 # %%find_lang_kf5