diff --git a/kde-baseapps.spec b/kde-baseapps.spec
index a79b933..3a6d97b 100644
--- a/kde-baseapps.spec
+++ b/kde-baseapps.spec
@@ -57,11 +57,13 @@ Provides:  kdebase = 6:%{version}-%{release}
 Obsoletes: kdebase4 < %{version}-%{release}
 Provides:  kdebase4 = %{version}-%{release}
 
+BuildRequires: desktop-file-utils
+%if 0%{fedora} < 22
 BuildRequires: baloo-devel >= 4.14
 BuildRequires: baloo-widgets-devel >= 4.14
-BuildRequires: desktop-file-utils
 BuildRequires: kactivities-devel
 BuildRequires: kfilemetadata-devel >= 4.14
+%endif
 BuildRequires: kdelibs4-devel >= 4.14
 %if 0%{?fedora} > 19
 BuildRequires: libappstream-glib
@@ -75,7 +77,6 @@ BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(zlib)
 
 Requires: %{name}-common = %{version}-%{release}
-Requires: dolphin = %{version}-%{release}
 %if 0%{?folderview}
 Requires: kde-plasma-folderview = 6:%{version}-%{release}
 %endif
@@ -137,11 +138,11 @@ Requires: kdelibs4-devel
 %description devel
 %{summary}.
 
-%package -n dolphin
-Summary: KDE File Manager
+%package -n dolphin4
+Summary: KDE4 File Manager
 Obsoletes: d3lphin
 Requires: %{name}-common = %{version}-%{release}
-Requires: dolphin-libs%{?_isa} = %{version}-%{release}
+Requires: dolphin4-libs%{?_isa} = %{version}-%{release}
 Requires: kdialog = %{version}-%{release}
 Requires: libkonq%{?_isa} = %{version}-%{release}
 Requires: konsole4-part
@@ -153,13 +154,13 @@ Requires: ruby
 %endif
 
 %{?kde_runtime_requires}
-%description -n dolphin
+%description -n dolphin4
 This package contains the default file manager of KDE.
 
-%package -n dolphin-libs
+%package -n dolphin4-libs
 Summary: Dolphin runtime libraries
-Requires: dolphin = %{version}-%{release}
-%description -n dolphin-libs
+Requires: dolphin4 = %{version}-%{release}
+%description -n dolphin4-libs
 %{summary}.
 
 %package -n kdepasswd
@@ -204,7 +205,7 @@ Obsoletes: konq-plugins < 4.6.80-1
 Provides:  konq-plugins = %{version}-%{release}
 Requires: %{name}-common = %{version}-%{release}
 # dolphinpart for embedded filemanagement
-Requires: dolphin = %{version}-%{release}
+Requires: dolphin4 = %{version}-%{release}
 Requires: konqueror-libs%{?_isa} = %{version}-%{release}
 Requires: kdialog = %{version}-%{release}
 Requires: libkonq%{?_isa} = %{version}-%{release}
@@ -293,7 +294,8 @@ mkdir -p %{buildroot}%{_kde4_appsdir}/konqueror/{kpartplugins,icons,opensearch}
 
 ## unpackaged files
 # libs for which there is no (public) api
-rm -fv %{buildroot}%{_kde4_libdir}/lib{dolphin,kbookmarkmodel_,konqueror}private.so
+rm -fv %{buildroot}%{_kde4_libdir}/lib{kbookmarkmodel_,konqueror}private.so
+rm -fv %{buildroot}%{_kde4_libdir}/libdolphinprivate4.so
 # omit konqsidebarplugin api bits (for now), nothing uses it afaict -- rex
 rm -fv %{buildroot}%{_kde4_libdir}/libkonqsidebarplugin.so
 rm -fv %{buildroot}%{_kde4_includedir}/konqsidebarplugin.h
@@ -316,14 +318,13 @@ done
 popd
 
 # fix documentation multilib conflict in index.cache
-for f in konqueror dolphin ; do
+for f in konqueror; do
    bunzip2 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache.bz2
    sed -i -e 's!name="id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
    sed -i -e 's!#id[a-z]*[0-9]*"!!g' %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
    bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache
 done
 
-%find_lang dolphin --with-kde --without-mo
 %find_lang kdepasswd --with-kde --without-mo
 %find_lang kfind --with-kde --without-mo
 %find_lang konqueror --with-kde --without-mo
@@ -365,23 +366,20 @@ fi
 %files common
 %doc COPYING COPYING.DOC COPYING.LIB
 
-%posttrans -n dolphin
+%posttrans -n dolphin4
 update-desktop-database -q &> /dev/null ||:
 
-%postun -n dolphin
+%postun -n dolphin4
 if [ $1 -eq 0 ] ; then
   update-desktop-database -q &> /dev/null ||:
 fi
 
-%files -n dolphin -f dolphin.lang
-%{_kde4_bindir}/dolphin
-%{_kde4_libdir}/libkdeinit4_dolphin.so
-%{_kde4_bindir}/servicemenu*
+%files -n dolphin4
+%{_kde4_bindir}/dolphin4
+%{_kde4_libdir}/libkdeinit4_dolphin4.so
 %{_kde4_appsdir}/dolphin/
-%{_kde4_datadir}/applications/kde4/dolphin.desktop
 %{_kde4_libdir}/kde4/kcm_dolphin*.so
 %{_kde4_libdir}/kde4/kio_filenamesearch.so
-%{_kde4_datadir}/config.kcfg/dolphin_*.kcfg
 %{_kde4_appsdir}/dolphinpart/
 %{_kde4_libdir}/kde4/dolphinpart.so
 %{_kde4_datadir}/kde4/services/dolphinpart.desktop
@@ -396,13 +394,12 @@ fi
 %{_kde4_libdir}/kde4/kcm_kio.so
 %{_kde4_datadir}/kde4/services/smb.desktop
 %{_kde4_datadir}/applications/kde4/Home.desktop
-%{_datadir}/appdata/dolphin.appdata.xml
 
-%post -n dolphin-libs -p /sbin/ldconfig
-%postun -n dolphin-libs -p /sbin/ldconfig
+%post -n dolphin4-libs -p /sbin/ldconfig
+%postun -n dolphin4-libs -p /sbin/ldconfig
 
-%files -n dolphin-libs
-%{_kde4_libdir}/libdolphinprivate.so.4*
+%files -n dolphin4-libs
+%{_kde4_libdir}/libdolphinprivate4.so.4*
 
 %post -n konqueror
 touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: