diff --git a/.gitignore b/.gitignore
index 699a08b..a31171e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 /digikam-5.8.0.tar.xz
 /digikam-5.9.0.tar.xz
+/kipi-plugins-5.9.0.tar.xz
+/digikam-6.0.0.tar.xz
diff --git a/digikam.spec b/digikam.spec
index b3c98be..1bdda91 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,12 +1,27 @@
 
+# use ninja or not
+%global ninja 1
+
+# build kipi-plugins bundled here (nor not)
+%global kipi_plugins 1
+%global kipi_plugins_version 5.9.0
+
+%global digikam_version 6.0.0
+
 Name:    digikam
 Summary: A digital camera accessing & photo management application
-Version: 5.9.0
-Release: 4%{?dist}
+Version: %{digikam_version}
+Release: 5%{?dist}
 
 License: GPLv2+
 URL:     http://www.digikam.org/
-Source0: http://download.kde.org/%{?beta:un}stable/digikam/digikam-%{version}%{?beta:-%{beta}}.tar.xz
+Source0: http://download.kde.org/%{?beta:un}stable/digikam/%{version}/digikam-%{version}%{?beta:-%{beta}}.tar.xz
+
+# kipi-plugins no longer distributed as part of digikam nor has any immediate plans to be released
+# seprately, so, extracted kipi-plugins content from digikam-5.9.0 tarball and included here for now
+# https://mail.kde.org/pipermail/digikam-devel/2019-January/101615.html
+# https://mail.kde.org/pipermail/digikam-devel/2019-February/101616.html
+Source1: kipi-plugins-5.9.0.tar.xz
 
 # digiKam not listed as a media handler for pictures in Nautilus (#516447)
 # TODO: upstream me
@@ -17,7 +32,10 @@ Source10: digikam-import.desktop
 ## upstreamable patches
 # doc-translated FTBFS, https://bugs.kde.org/show_bug.cgi?id=377597
 Patch100: digikam-5.9.0-doc_translated.patch
-Patch101: digikam-5.7.0-glibc_powf64.patch
+
+%if 0%{?ninja}
+BuildRequires: ninja-build
+%endif
 
 BuildRequires: boost-devel
 BuildRequires: eigen3-devel
@@ -39,14 +57,12 @@ BuildRequires: pkgconfig(libgphoto2_port) pkgconfig(libusb-1.0) pkgconfig(libusb
 BuildRequires: pkgconfig(libpng) >= 1.2.7
 BuildRequires: pkgconfig(phonon4qt5)
 ## uses QtAv now (not available in fedora)
-#BuildRequires: pkgconfig(Qt5Multimedia) >= 5.6
 BuildRequires: pkgconfig(Qt5OpenGL)
 BuildRequires: pkgconfig(Qt5Svg)
 BuildRequires: pkgconfig(Qt5WebKit)
 BuildRequires: pkgconfig(Qt5XmlPatterns)
 BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(x11) pkgconfig(xproto)
-# fixme: f24's qt-5.6.x currently does not yet define qt5_qtwebengine_arches macro -- rex
 %if 0%{?qt5_qtwebengine_arches:1}
 %ifarch %{?qt5_qtwebengine_arches}
 BuildRequires: cmake(KF5AkonadiContact)
@@ -82,12 +98,7 @@ BuildRequires: expat-devel
 ## htmlexport plugin
 BuildRequires: pkgconfig(libxslt)
 ## RemoveRedeye
-%if 0%{?fedora} > 24
-%global opencv3 -DENABLE_OPENCV3:BOOL=ON
-BuildRequires: pkgconfig(opencv) >= 3
-%else
-BuildRequires: pkgconfig(opencv) >= 2.4.9
-%endif
+BuildRequires: pkgconfig(opencv) >= 3.1
 # Panorama plugin requires flex and bison
 BuildRequires: flex
 BuildRequires: bison
@@ -102,7 +113,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Recommends: %{name}-doc = %{version}-%{release}
 # expoblending assistant
 Recommends: hugin-base
-Recommends: kf5-kipi-plugins = %{version}-%{release}
+#Recommends: kf5-kipi-plugins
 # thumbnailers, better default access to mtp-enabled devices
 Recommends: kio-extras
 Recommends: qt5-qtbase-mysql%{?_isa}
@@ -119,10 +130,6 @@ An easy to use interface is provided to connect to your digital camera,
 preview the images and download and/or delete them.
 
 digiKam built-in image editor makes the common photo correction a simple task.
-The image editor is extensible via plugins, can also make use of the KIPI image
-handling plugins to extend its capabilities even further for photo
-manipulations, import and export, etc. Install the kf5-kipi-plugins packages
-to use them.
 
 %package libs
 Summary: Runtime libraries for %{name}
@@ -148,8 +155,10 @@ BuildArch: noarch
 %description doc
 %{summary}.
 
+%if 0%{?kipi_plugins}
 %package -n kf5-kipi-plugins
 Summary: Plugins to use with kf5-libkipi applications
+Version: %{kipi_plugins_version}
 # upgrade path
 Obsoletes: kipi-plugins < 5.0.0-0.9
 Requires: kf5-kipi-plugins-libs%{?_isa} = %{version}-%{release}
@@ -161,6 +170,7 @@ Interface.
 
 %package -n kf5-kipi-plugins-libs
 Summary: Runtime libraries for kf5-kipi-plugins
+Version: %{kipi_plugins_version}
 # upgrade path
 Obsoletes: kipi-plugins-libs < 5.0.0-0.9
 Requires: kf5-kipi-plugins = %{version}-%{release}
@@ -169,17 +179,22 @@ Requires: kf5-kipi-plugins = %{version}-%{release}
 
 %package -n kipi-plugins-doc
 Summary: Application handbooks
+Version: %{kipi_plugins_version}
 Requires:  kf5-kipi-plugins = %{version}-%{release}
 BuildArch: noarch
 %description -n kipi-plugins-doc
 %{summary}.
+%endif
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?beta:-%{beta}}
+%setup -q -n %{name}-%{digikam_version}%{?beta:-%{beta}} %{?kipi_plugins:-a1}
+
+%if 0%{?kipi_plugins}
+echo 'add_subdirectory(extra)' >> CMakeLists.txt
+%endif
 
 %patch100 -p1 -b .doc_translated
-#patch101 -p1 -b .glibc_powf64
 
 # EVIV2_MIN_VERSION
 sed -i -e "s|0.26|0.25|g" core/CMakeLists.txt
@@ -189,30 +204,38 @@ sed -i -e "s|0.26|0.25|g" core/CMakeLists.txt
 mkdir %{_target_platform}
 pushd %{_target_platform}
 %{cmake_kf5} .. \
+  %{?ninja:-G Ninja} \
   -DENABLE_AKONADICONTACTSUPPORT:BOOL=ON \
   -DENABLE_APPSTYLES:BOOL=ON \
   -DENABLE_KFILEMETADATASUPPORT:BOOL=ON \
   -DENABLE_MEDIAPLAYER:BOOL=OFF \
   -DENABLE_MYSQLSUPPORT:BOOL=ON \
-  -DENABLE_INTERNALMYSQL:BOOL=ON \
-  %{?opencv3}
+  -DENABLE_INTERNALMYSQL:BOOL=ON
 popd
 
-%make_build -C %{_target_platform} VERBOSE=1
+%if 0%{?ninja}
+%ninja_build -C %{_target_platform}
+%else
+%make_build -C %{_target_platform}
+%endif
 
 
 %install
+%if 0%{?ninja}
+%ninja_install -C %{_target_platform}
+%else
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%endif
 
 desktop-file-install --vendor="" \
   --dir=%{buildroot}%{_datadir}/applications/ \
   %{SOURCE10}
 
-%find_lang all --all-name --with-html
+%find_lang all --all-name --with-html || touch all.lang
 
-grep digikam.mo all.lang > digikam.lang
-grep HTML all.lang > digikam-doc.lang
-grep kipiplugin all.lang > kipiplugin.lang
+grep digikam.mo all.lang > digikam.lang ||:
+grep HTML all.lang > digikam-doc.lang ||:
+grep kipiplugin all.lang > kipiplugin.lang ||:
 
 ## unpackaged files
 rm -fv %{buildroot}%{_datadir}/locale/*/LC_MESSAGES/libkvkontakte.mo
@@ -240,9 +263,9 @@ update-desktop-database -q &> /dev/null
 %endif
 
 %files -f digikam.lang
-%doc core/AUTHORS core/ChangeLog
-%doc core/NEWS core/README.md core/TODO
-%license core/COPYING
+%doc AUTHORS ChangeLog
+%doc NEWS README.md
+%license COPYING
 %{_kf5_bindir}/digikam
 %{_kf5_bindir}/digitaglinktree
 %{_kf5_bindir}/cleanup_digikamdb
@@ -250,13 +273,9 @@ update-desktop-database -q &> /dev/null
 %{_kf5_datadir}/kxmlgui5/digikam/
 %{_kf5_datadir}/kxmlgui5/showfoto/
 %{_kf5_datadir}/knotifications5/digikam.notifyrc
-#{_kf5_datadir}/kconf_update/adjustlevelstool.upd
-#{_kf5_datadir}/kservices5/digikamimageplugin_*.desktop
-#{_kf5_datadir}/kservicetypes5/digikamimageplugin.desktop
 %{_kf5_datadir}/digikam/
 %{_kf5_datadir}/showfoto/
 %{_kf5_datadir}/solid/actions/digikam*.desktop
-#{_kf5_metainfodir}/digiKam-ImagePlugin*xml
 %{_kf5_metainfodir}/org.kde.digikam.appdata.xml
 %{_kf5_metainfodir}/org.kde.showfoto.appdata.xml
 %{_kf5_datadir}/applications/digikam-import.desktop
@@ -264,11 +283,10 @@ update-desktop-database -q &> /dev/null
 %{_kf5_datadir}/applications/org.kde.showfoto.desktop
 %{_mandir}/man1/digitaglinktree.1*
 %{_mandir}/man1/cleanup_digikamdb.1*
-%{_kf5_datadir}/icons/hicolor/*/actions/*
-%{_kf5_datadir}/icons/hicolor/*/apps/digikam*
-%{_kf5_datadir}/icons/hicolor/*/apps/showfoto*
+%{_kf5_datadir}/icons/hicolor/*/*/*
 
-%files doc -f digikam-doc.lang
+%files doc
+#-f digikam-doc.lang
 
 %ldconfig_scriptlets libs
 
@@ -277,6 +295,8 @@ update-desktop-database -q &> /dev/null
 %{_kf5_libdir}/libdigikamdatabase.so*
 %{_kf5_libdir}/libdigikamgui.so*
 
+%if 0%{?kipi_plugins}
+%if 0%{?rhel} && 0%{?rhel} < 8
 %post -n kf5-kipi-plugins
 touch --no-create %{_kf5_datadir}/icons/hicolor &> /dev/null  ||:
 
@@ -288,6 +308,7 @@ fi
 
 %posttrans -n kf5-kipi-plugins
 gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||:
+%endif
 
 %files -n kf5-kipi-plugins -f kipiplugin.lang
 %doc extra/kipi-plugins/AUTHORS extra/kipi-plugins/ChangeLog
@@ -309,9 +330,15 @@ gtk-update-icon-cache %{_kf5_datadir}/icons/hicolor >& /dev/null ||:
 %files -n kf5-kipi-plugins-libs
 %{_kf5_libdir}/libKF5kipiplugins.so*
 %{_kf5_qtplugindir}/kipiplugin_*.so
+%endif
 
 
 %changelog
+* Tue Feb 26 2019 Rex Dieter <rdieter@fedoraproject.org> - 6.0.0-5
+- digikam-6.0.0
+- include kipi-plugins-5.9.0 here (for now)
+- %build: use ninja
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index c69f3ae..43f05bd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (digikam-5.9.0.tar.xz) = f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63
+SHA512 (kipi-plugins-5.9.0.tar.xz) = 4c891f5b8d26d76de4a46524ca2bc1b66ea6f58ad671ec167c36bf6e56bb5193294fbc52287a457c0e98aa145913aa6779e0d7b3cdbbb9a3cfe47bd038bc4acc
+SHA512 (digikam-6.0.0.tar.xz) = b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb