diff --git a/gnome-applets.spec b/gnome-applets.spec
index ac5957a..e5e342a 100644
--- a/gnome-applets.spec
+++ b/gnome-applets.spec
@@ -1,6 +1,3 @@
-# apmd is built on %{ix86} and ppc
-%define apmd_archs %{ix86} ppc
-
 %define glib2_version 2.2.0
 %define pango_version 1.2.0
 %define gtk2_version 2.6.0
@@ -11,7 +8,6 @@
 %define libbonoboui_version 2.3.0
 %define gstreamer_plugins_version 0.7.6-2
 %define libxklavier_version 1.13
-%define apmd_version 3.0.2-22
 %define libwnck_version 2.9.3
 
 %define po_package gnome-applets-2.0
@@ -19,7 +15,7 @@
 Summary:        Small applications for the GNOME panel.
 Name:     	gnome-applets
 Version: 	2.10.1
-Release: 6
+Release:        7
 Epoch:          1
 License:	GPL
 Group:          User Interface/Desktops
@@ -81,13 +77,7 @@ tar xjf %{SOURCE1}
 autoconf
 %build
 
-%ifarch %{apmd_archs}
-%define DisableBattstat ""
-%else
-%define DisableBattstat "--disable-battstat"
-%endif
-
-%configure %{DisableBattstat}
+%configure
 make
 
 %install
@@ -114,10 +104,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
 fi
 
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-%ifarch %{apmd_archs}
-SCHEMAS="battstat.schemas"
-%endif
-SCHEMAS="$SCHEMAS charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas multiload.schemas stickynotes.schemas"
+SCHEMAS="battstat.schemas charpick.schemas cpufreq-applet.schemas drivemount.schemas geyes.schemas gswitchit.schemas gtik.schemas gweather.schemas mini-commander-global.schemas mini-commander.schemas mixer.schemas multiload.schemas stickynotes.schemas"
 for S in $SCHEMAS; do
   gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null
 done
@@ -146,9 +133,7 @@ fi
 %{_libdir}/bonobo/servers/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/*
-%ifarch %{apmd_archs}
 %{_sysconfdir}/sound
-%endif
 
 # These are really devel files, but we don't want a devel package
 # for just three files
@@ -156,6 +141,9 @@ fi
 %{_libdir}/pkgconfig/gswitchit.pc
 
 %changelog
+* Fri May 13 2005 Ray Strode <rstrode@redhat.com> 1:2.10.1-7
+- Don't disable battstat on some platforms (bug 157683).
+
 * Wed Apr 27 2005 Jeremy Katz <katzj@redhat.com> - 1:2.10.1-6
 - silence %%post