diff --git a/libreoffice.spec b/libreoffice.spec
index df80454..7058406 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -1188,8 +1188,14 @@ rm -rf icons/gnome applications application-registry
 find . -name "*.desktop" -exec sed -i -e s/$PRODUCTVERSIONSHORT//g {} \;
 
 #relocate the rest of them
-cp -r icons $RPM_BUILD_ROOT/%{_datadir}
-cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
+ICONVERSION=`echo $PRODUCTVERSION | sed -e 's/\.//'`
+for f in `find icons -type f`; do
+    [ ! -d `dirname $f` ] && mkdir -p `dirname $f`
+    cp -p $f `echo $f | sed s/libreoffice$ICONVERSION/libreoffice/`
+done
+mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime-info
+cp -p mime-info/libreoffice$PRODUCTVERSION.keys $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.keys
+cp -p mime-info/libreoffice$PRODUCTVERSION.mime $RPM_BUILD_ROOT/%{_datadir}/mime-info/libreoffice.mime
 #add our mime-types, e.g. for .oxt extensions
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/mime/packages
 cp -p mime/packages/libreoffice$PRODUCTVERSION.xml $RPM_BUILD_ROOT/%{_datadir}/mime/packages/libreoffice.xml