diff --git a/gnome-panel.spec b/gnome-panel.spec
index b82b1e3..dcad8ca 100644
--- a/gnome-panel.spec
+++ b/gnome-panel.spec
@@ -16,7 +16,7 @@
 Summary: GNOME panel
 Name: gnome-panel
 Version: 2.8.1
-Release: 4
+Release: 5
 URL: http://www.gnome.org
 Source0: ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/gnome-panel/%{name}-%{version}.tar.bz2
 Source1: %{name}-%{version}-extrapo.tar.bz2
@@ -58,6 +58,7 @@ BuildRequires: libtool automake autoconf
 BuildRequires: gnome-keyring-devel
 BuildRequires: evolution-data-server-devel
 
+Patch0: gnome-panel-2.8.1-use-new-config-location.patch
 Patch1: gnome-panel-2.6.0-use-correct-applications-uri.patch
 Patch2: gnome-panel-2.3.6.2-default-menu-flags.patch
 Patch3: gnome-panel-2.0.3-remove-screenshot-menuitem.patch
@@ -87,6 +88,7 @@ Panel Applets using the libpanel-applet library.
 
 (cd po && tar -xvjf %{SOURCE1})
 
+%patch0 -p1 -b .use-new-config-location
 %patch1 -p1 -b .use-correct-applications-uri
 %patch2 -p1 -b .default-menu-flags
 %patch3 -p1 -b .remove-screenshot-menuitem
@@ -118,6 +120,13 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 ## install battstat schemas
 install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries
 
+#
+# Create pager and tasklist schemas for compatibility with older
+# configurations which reference the old schema names
+#
+sed -e 's|/schemas/apps/window_list_applet/prefs/|/schemas/apps/tasklist_applet/prefs/|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/window-list.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/tasklist.schemas
+sed -e 's|/schemas/apps/workspace_switcher_applet/prefs/|/schemas/apps/pager_applet/prefs/|; s|<default>1</default>|<default>2</default>|' $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/workspace-switcher.schemas > $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/pager.schemas
+
 ## blow away stuff we don't want
 /bin/rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 /bin/rm -f $RPM_BUILD_ROOT%{_libdir}/libpanel-applet-2.*a
@@ -144,21 +153,30 @@ fi
 %endif
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+
+#
+# Clear out the old defaults
+#
+gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /apps/panel > /dev/null
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --recursive-unset /schemas/apps/panel > /dev/null
 
-SCHEMAS="panel-global.schemas panel-general.schemas panel-toplevel.schemas panel-object.schemas gnome-panel-screenshot.schemas clock.schemas fish.schemas window-list.schemas workspace-switcher.schemas panel-compatibility.schemas"
+#
+# Install the schemas
+#
+SCHEMAS="panel-global.schemas panel-general.schemas panel-toplevel.schemas panel-object.schemas gnome-panel-screenshot.schemas clock.schemas fish.schemas window-list.schemas workspace-switcher.schemas panel-compatibility.schemas tasklist.schemas pager.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
 
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --unset /apps/panel/default_setup/general/applet_id_list > /dev/null
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --unset /apps/panel/profiles/default/general/applet_id_list > /dev/null
+#
+# Install the default setup into /apps/panel and /apps/panel/default_setup
+#
 gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries > /dev/null
-gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null
+gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null
 
 if [ "$apm" = "true" ]; then
   gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries > /dev/null
-  gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries /apps/panel/profiles/default/applets/battstat_applet > /dev/null
+  gconftool-2 --direct --config-source=$GCONF_CONFIG_SOURCE --load %{_sysconfdir}/gconf/schemas/panel-default-setup-battstat.entries /apps/panel/applets/battstat_applet > /dev/null
 fi
 
 /sbin/ldconfig
@@ -196,9 +214,17 @@ fi
 %{_datadir}/gtk-doc
 
 %changelog
+* Fri Nov 12 2004 Mark McLoughlin <markmc@redhat.com> - 2.8.1-5
+- Use /apps/panel for configuration so that homedir sharing with
+  previous versions works reasonably well. This is the location
+  upstream is using from GNOME 2.10 onwards.
+- Install old pager.schemas and tasklist.schemas so that
+  old configurations which reference the old schema names
+  continue to work
+
 * Mon Nov  1 2004 Mark McLoughlin <markmc@redhat.com> - 2.8.1-4
-- Fix use-correct-applications-uri patch to not crash on ia64.
-  Fix from Dave Malcolm in #136908
+- Fix use-correct-applications-uri patch to not crash on
+  ia64 - fix from Dave Malcolm (#136908)
 
 * Mon Oct 18 2004  <jrb@redhat.com> - 2.8.1-3
 - change redhat-web.desktop and redhat-email.desktop to be in /usr/share instead of using the menu path
diff --git a/redhat-panel-default-setup.entries b/redhat-panel-default-setup.entries
index 27297fa..7ad68a2 100644
--- a/redhat-panel-default-setup.entries
+++ b/redhat-panel-default-setup.entries
@@ -60,9 +60,6 @@
 
     </entry>
 
-    <entry><key>general/enable_program_list</key><schema_key>/schemas/apps/panel/general/enable_program_list</schema_key></entry>
-    <entry><key>general/show_program_list</key><schema_key>/schemas/apps/panel/general/show_program_list</schema_key></entry>
-
   <!-- Top Panel -->
 
     <entry>