diff --git a/abiword.keys b/abiword.keys
new file mode 100644
index 0000000..9612750
--- /dev/null
+++ b/abiword.keys
@@ -0,0 +1,7 @@
+application/x-abiword
+	open=abiword %f
+	view=abiword %f
+
+application/x-abicollab
+	open=abiword %f
+	view=abiword %f
diff --git a/abiword.spec b/abiword.spec
index f4b406d..5137a5b 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -14,6 +14,8 @@ License: GPLv2+
 Source0: http://abisource.com/downloads/abiword/%{version}/source/abiword-%{version}.tar.gz
 Source1: http://abisource.com/downloads/abiword/%{version}/source/abiword-docs-%{version}.tar.gz
 Source11: abiword.mime
+Source12: abiword.keys
+Source13: abiword.xml
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 URL: http://www.abisource.com/
 
@@ -103,18 +105,18 @@ cd $RPM_BUILD_DIR/abiword-%{version}
 %else
 %configure --disable-static --enable-plugins --enable-clipart --enable-templates
 %endif
-make %{?_smp_mflags}
+%{__make} %{?_smp_mflags}
 
 # build the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
 ABI_DOC_PROG=$(pwd)/../%{name}-%{version}/src/abiword ./make-html.sh
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 # install abiword
 cd $RPM_BUILD_DIR/abiword-%{version}
-make install DESTDIR=$RPM_BUILD_ROOT
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # install the documentation
 cd $RPM_BUILD_DIR/abiword-docs-%{version}
@@ -135,29 +137,34 @@ desktop-file-install --vendor fedora --add-category X-Fedora \
   --add-category Applications --add-category Office \
   ./abiword.desktop
 # remove the original one (which has X-Red-Hat-Base)  (#107023)
-rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
+%{__rm} -f $RPM_BUILD_ROOT/%{_datadir}/applications/abiword.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime-info
-install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info
+%{__install} -p -m 0644 -D %{SOURCE11} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.mime
+%{__install} -p -m 0644 -D %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mime-info/abiword.keys
+%{__install} -p -m 0644 -D %{SOURCE13} $RPM_BUILD_ROOT%{_datadir}/mime/packages/abiword.xml
 
 # nuke .la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
+%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/libabiword-%{majorversion}.%{minorversion}.la
+%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/%{name}-%{majorversion}.%{minorversion}/plugins/*.la
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %postun
-update-desktop-database %{_datadir}/applications
+update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
 %{_bindir}/abiword
 %{_datadir}/applications/*
-%{_datadir}/mime-info/*
+%{_datadir}/mime-info/abiword.mime
+%{_datadir}/mime-info/abiword.keys
+%{_datadir}/mime/packages/abiword.xml
 %{_datadir}/pixmaps/*png
 
 %files -n libabiword
diff --git a/abiword.xml b/abiword.xml
new file mode 100644
index 0000000..9266c57
--- /dev/null
+++ b/abiword.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-abicollab">
+    <comment>AbiWord Collaborative Document</comment>
+    <glob pattern="*.abicollab"/>
+  </mime-type>
+</mime-info>
+