-%dir %{_datadir}/AbiSuite-%{mver}
-%dir %{_datadir}/AbiSuite-%{mver}/AbiWord
-%dir %{_datadir}/AbiSuite-%{mver}/AbiWord/scripts
-%dir %{_libdir}/AbiWord-%{mver}
-%dir %{_libdir}/AbiWord-%{mver}/plugins
-%{_datadir}/AbiSuite-%{mver}/AbiWord/glade
-%{_datadir}/AbiSuite-%{mver}/AbiWord/scripts/*
-%{_datadir}/AbiSuite-%{mver}/AbiWord/strings
-%{_datadir}/AbiSuite-%{mver}/AbiWord/system.profile*
-%{_datadir}/AbiSuite-%{mver}/icons
-%{_datadir}/AbiSuite-%{mver}/templates
-%{_desktopdir}/*
-%{_pixmapsdir}/*.png
-%{_datadir}/AbiSuite-%{mver}/AbiWord/readme.txt
-%{_libdir}/AbiWord-%{mver}/plugins/AbiWord
-
-%files plugin-aiksaurus
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiAikSaurus.so
-
-%files plugin-babelfish
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiBabelfish.so
-
-%files plugin-capi
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiCAPI.so
+%attr(755,root,root) %{_libdir}/libabiword-%{mver}.so
+%dir %{_libdir}/abiword-%{mver}
+%dir %{_libdir}/abiword-%{mver}/plugins
+%dir %{_datadir}/abiword-%{mver}
+%{_datadir}/abiword-%{mver}/Presentation.xml
+%{_datadir}/abiword-%{mver}/readme.abw
+%{_datadir}/abiword-%{mver}/readme.txt
+%{_datadir}/abiword-%{mver}/strings
+%{_datadir}/abiword-%{mver}/system.profile*
+%{_datadir}/abiword-%{mver}/templates
+%{_datadir}/abiword-%{mver}/ui
+%{_datadir}/abiword-%{mver}/xsltml
+%{_datadir}/abiword-%{mver}/mime-info
+%{_datadir}/abiword-%{mver}/omml_xslt
+%{_desktopdir}/*.desktop
+%{_iconsdir}/hicolor/*/apps/abiword.*
+%{_mandir}/man1/abiword.1*
+%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.AbiCollab.service
+%{_datadir}/telepathy/clients/AbiCollab.client
+
+# These don't add any additional dependencies so there's no reason to split
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/applix.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/babelfish.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/bmp.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/clarisworks.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/docbook.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/eml.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/epub.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/freetranslation.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/garble.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/gdict.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/gimp.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/google.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/hancom.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/hrtext.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/iscii.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/kword.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/loadbindings.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/mht.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/mif.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/mswrite.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/opml.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/opendocument.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/openwriter.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/openxml.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/paint.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/passepartout.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/pdb.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/pdf.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/presentation.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/s5.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/sdw.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/t602.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/urldict.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wikipedia.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wml.so
+#%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/wpg.so
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/xslfo.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/libabiword-%{mver}.la
+%{_includedir}/abiword-%{mver}
+%{_pkgconfigdir}/abiword-%{mver}.pc
+
+%files plugin-aiksaurus
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/aiksaurus.so
+%attr(755,root,root) %{_libdir}/libAiksaurusGtk3--export-dynamic.so
+%attr(755,root,root) %{_libdir}/libAiksaurusGtk3.so
+
+%files plugin-collab
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/abiword-%{mver}/plugins/collab.so