diff --git a/.cvsignore b/.cvsignore
index c024612..598a8d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-applets-2.5.4.tar.bz2
+gnome-applets-2.5.7.tar.bz2
diff --git a/gnome-applets.spec b/gnome-applets.spec
index 2f95c28..ea340ed 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -4,17 +4,19 @@
 %define pango_version 1.2.0
 %define gtk2_version 2.2.0
 %define libgnomeui_version 2.3.0
-%define gnome_panel_version 2.5.0
+%define gnome_panel_version 2.5.91
 %define libgtop2_version 2.5.0
 %define gail_version 1.2.0
 %define libbonoboui_version 2.3.0
+%define gstreamer_plugins_version 0.7.6-2
+%define libxklavier_version 0.97
 
 %define po_package gnome-applets-2.0
 
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
-Version: 	2.5.4
-Release:        1
+Version: 	2.5.7
+Release: 4
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -28,19 +30,21 @@ Prereq:         scrollkeeper >= 0.1.4
 BuildRequires:  glib2-devel >= %{glib2_version}
 BuildRequires:  gtk2-devel >= %{gtk2_version}
 BuildRequires:  libgnomeui-devel >= %{libgnomeui_version}
-BuildRequires:  gnome-panel >= %{gnome_panel_version}
+BuildRequires:  gnome-panel-devel >= %{gnome_panel_version}
 BuildRequires:  libgtop2-devel >= %{libgtop2_version}
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  gail-devel >= %{gail_version}
+BuildRequires:  libxklavier-devel >= %{libxklavier_version}
+BuildRequires:  gstreamer-plugins-devel >= %{gstreamer_plugins_version}
 BuildRequires:  /usr/bin/automake
-BuildRequires:  libxklavier
 BuildRequires:  libbonoboui-devel >= %{libbonoboui_version}
 %ifnarch %{no_apm_archs}
 BuildRequires:  apmd
 %endif
 
 Requires:	gnome-panel >= %{gnome_panel_version}
-Requires:       libxklavier
+Requires:	libxklavier >= %{libxklavier_version}
+Requires:	gstreamer-plugins >= %{gstreamer_plugins_version}
 
 Obsoletes:      battstat_applet
 
@@ -55,8 +59,7 @@ Patch2: gnome-applets-2.3.6-uniquecd.patch
 Patch3: gnome-applets-2.0.1-keepclosed.patch
 # Shrink volume applet for msw
 Patch4: gnome-applets-2.3.6-smallvolume.patch
-
-Patch5: gnome-applets-2.5.4-xklavier.patch
+Patch5: gnome-applets-2.5.6-libapm.patch
 
 
 %description
@@ -84,10 +87,7 @@ cp %{SOURCE2} .
 %patch4 -p1 -b .smallvolume
 # Fix up mode 0000 files created by patch2
 chmod -R a+r .
-
-cd libgswitchit
-%patch5 -p0 -b .xklavier
-cd ..
+%patch5 -p1 -b .libapm
 
 %build
 
@@ -138,7 +138,9 @@ done
 %{_datadir}/xmodmap
 %{_datadir}/gweather
 %{_datadir}/stickynotes
+%ifnarch %{no_apm_archs}
 %{_datadir}/battstat_applet
+%endif
 %{_datadir}/gswitchit
 %{_datadir}/omf
 %{_datadir}/wireless-applet
@@ -157,6 +159,28 @@ done
 
 
 %changelog
+* Tue Mar 16 2004 Jeremy Katz <katzj@redhat.com> 1:2.5.7-4
+- rebuild for new gstreamer
+
+* Thu Mar 11 2004 Mark McLoughlin <markmc@redhat.com> 2.5.7-3
+- Update Requires/BuildRequires to include gstreamer-plugins
+
+* Thu Mar 11 2004 Mark McLoughlin <markmc@redhat.com> 2.5.7-2
+- Rebuild
+
+* Wed Mar 10 2004 Mark McLoughlin <markmc@redhat.com> 2.5.7-1
+- Update to 2.5.7
+- Add gnome-panel-devel BuildRequires
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Feb 26 2004 Alexander Larsson <alexl@redhat.com> 1:2.5.6-1
+- update to 2..5.6
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
 * Tue Jan 27 2004 Alexander Larsson <alexl@redhat.com> 1:2.5.4-1
 - update to 2.5.4
 
diff --git a/sources b/sources
index 37d12d5..88cc1ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-93c0dd87e32f4bbaec3d3c4859679db0  gnome-applets-2.5.4.tar.bz2
+a1b053ec93d861dbd07052e66895647b  gnome-applets-2.5.7.tar.bz2