diff --git a/gnome-panel.spec b/gnome-panel.spec
index 6a5680d..b471a74 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -23,7 +23,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.10.1
-Release: 7
+Release: 8
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: redhat-panel-default-setup.entries
@@ -237,7 +237,11 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
-* Wed Apr 27 2005 Mark McLoughlin <markmc@redhat.com> - 2.10.1-6
+* Mon May  2 2005 Mark McLoughlin <markmc@redhat.com> 2.10.1-8
+- Update to new OpenOffice.org .desktop file locations in
+  openoffice.org-1.9.97-3 (bug #156064)
+
+* Wed Apr 27 2005 Mark McLoughlin <markmc@redhat.com> - 2.10.1-7
 - Add patch to clamp the size of the icons on the panel at 48x48. Fixes
   "moved the panel to the side, can't move it back" issue (rh #141743)
 
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 79cd917..e3942a1 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -361,7 +361,7 @@
       <key>objects/wordprocessor_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/writer.desktop</string>
+        <string>/usr/share/applications/openoffice.org-1.9-writer.desktop</string>
       </value>
     </entry>
 
@@ -415,7 +415,7 @@
       <key>objects/presentation_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/impress.desktop</string>
+        <string>/usr/share/applications/openoffice.org-1.9-impress.desktop</string>
       </value>
     </entry>
 
@@ -469,7 +469,7 @@
       <key>objects/spreadsheet_launcher/launcher_location</key>
       <schema_key>/schemas/apps/panel/objects/launcher_location</schema_key>
       <value>
-        <string>/usr/share/applications/calc.desktop</string>
+        <string>/usr/share/applications/openoffice.org-1.9-calc.desktop</string>
       </value>
     </entry>