diff --git a/defaults.list b/defaults.list
index 411a592..5430c74 100644
--- a/defaults.list
+++ b/defaults.list
@@ -38,22 +38,22 @@ image/x-xbitmap=gnome-eog.desktop
 image/x-xpixmap=gnome-eog.desktop
 image/x-xwindowdump=gnome-eog.desktop
 image/svg+xml=gnome-eog.desktop
-application/vnd.ms-word=redhat-word-processor.desktop
-application/vnd.wordperfect=gnome-abiword.desktop
-application/vnd.sun.xml.writer=redhat-word-processor.desktop
-application/vnd.sun.xml.writer.global=redhat-word-processor.desktop
-application/vnd.stardivision.writer=redhat-word-processor.desktop
-application/vnd.ms-excel=redhat-spreadsheet.desktop
-application/vnd.stardivision.calc=redhat-spreadsheet.desktop
-application/vnd.sun.xml.calc=redhat-spreadsheet.desktop
-application/vnd.sun.xml.calc.template=redhat-spreadsheet.desktop
-application/vnd.ms-powerpoint=redhat-presentations.desktop
-application/vnd.stardivision.impress=redhat-presentations.desktop
-application/vnd.sun.xml.impress=redhat-presentations.desktop
-application/vnd.sun.xml.impress.template=redhat-presentations.desktop
-application/vnd.stardivision.draw=redhat-drawing.desktop
-application/vnd.sun.xml.draw=redhat-drawing.desktop
-application/vnd.sun.xml.draw.template=redhat-drawing.desktop
+application/vnd.ms-word=openoffice.org-1.9-writer.desktop
+application/vnd.wordperfect=openoffice.org-1.9-writer.desktop
+application/vnd.sun.xml.writer=openoffice.org-1.9-writer.desktop
+application/vnd.sun.xml.writer.global=openoffice.org-1.9-writer.desktop
+application/vnd.stardivision.writer=openoffice.org-1.9-writer.desktop
+application/vnd.ms-excel=openoffice.org-1.9-calc.desktop
+application/vnd.stardivision.calc=openoffice.org-1.9-calc.desktop
+application/vnd.sun.xml.calc=openoffice.org-1.9-calc.desktop
+application/vnd.sun.xml.calc.template=openoffice.org-1.9-calc.desktop
+application/vnd.ms-powerpoint=openoffice.org-1.9-impress.desktop
+application/vnd.stardivision.impress=openoffice.org-1.9-impress.desktop
+application/vnd.sun.xml.impress=openoffice.org-1.9-impress.desktop
+application/vnd.sun.xml.impress.template=openoffice.org-1.9-impress.desktop
+application/vnd.stardivision.draw=openoffice.org-1.9-draw.desktop
+application/vnd.sun.xml.draw=openoffice.org-1.9-draw.desktop
+application/vnd.sun.xml.draw.template=openoffice.org-1.9-draw.desktop
 application/ogg=realplay.desktop
 audio/x-mp3=realplay.desktop
 audio/x-mp3-playlist=realplay.desktop
diff --git a/shared-mime-info.spec b/shared-mime-info.spec
index 10dffc3..69dd165 100644
--- a/shared-mime-info.spec
+++ b/shared-mime-info.spec
@@ -1,7 +1,7 @@
 Summary: Shared MIME information database
 Name: shared-mime-info
 Version: 0.16
-Release: 2
+Release: 3
 License: GPL
 Group: System Environment/Libraries
 URL: http://freedesktop.org/Software/shared-mime-info
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*
 
 %changelog
+* Fri May 20 2005 Dan Williams <dcbw@redhat.com> - 0.16-3
+- Update OpenOffice.org desktop file names. #155353
+
 * Sun Apr  3 2005 David Zeuthen <davidz@redhat.com> - 0.16-2
 - Make Evince the default for application/pdf and application/postscript
 - Remove remaining references to gnome-ggv (application/x-gzpostscript and