diff --git a/.cvsignore b/.cvsignore
index 0e35aeb..9017ad7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 acpid-1.0.4.tar.gz
+acpid.power.sh
diff --git a/acpid.power.conf b/acpid.power.conf
index 44c63d8..9841c52 100644
--- a/acpid.power.conf
+++ b/acpid.power.conf
@@ -1,5 +1,4 @@
-# ACPID config to power down machine if powerbutton is pressed, but only if
-# no gnome-power-manager is running
+# ACPID config to manage power button
 
 event=button/power.*
-action=/bin/ps awwux | /bin/grep gnome-power-manager | /bin/grep -qv grep || /sbin/shutdown -h now
+action=/etc/acpi/actions/power.sh
diff --git a/acpid.spec b/acpid.spec
index 29067e7..7577fa5 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -1,7 +1,7 @@
 Summary: ACPI Event Daemon
 Name: acpid
 Version: 1.0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
@@ -9,6 +9,7 @@ Source1: acpid.logrotate
 Source2: acpid.init
 Source3: acpid.video.conf
 Source4: acpid.power.conf
+Source5: acpid.power.sh
 Patch1: acpid-1.0.3-makefile.patch
 Patch2: acpid-1.0.4-warning.patch
 Patch3: acpid-1.0.4-pie.patch
@@ -46,6 +47,7 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions
 chmod 755 $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events
 install -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/video.conf
 install -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/events/power.conf
+install -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/acpi/actions/power.sh
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/acpid
@@ -66,6 +68,7 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/acpi/actions
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/video.conf
 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/acpi/events/power.conf
+%config(noreplace) %attr(0755,root,root) %{_sysconfdir}/acpi/actions/power.sh
 %config(noreplace) %{_sysconfdir}/logrotate.d/acpid
 %{_bindir}/acpi_listen
 %{_sbindir}/acpid
@@ -89,6 +92,10 @@ if [ "$1" -ge "1" ]; then
 fi
 
 %changelog
+* Wed Jan 23 2008 Zdenek Prikryl <zprikryl@redhat.com> - 1.0.4-9.fc7
+- Fixed managing of power button (#361501)
+- Fixed power script to check for KDE power manager (#419331)
+
 * Wed Sep 26 2007 Zdenek Prikryl <zprikryl@redhat.com> - 1.0.4-8.fc7
 - Fixed leak of a file descriptor (#304761)
 
diff --git a/sources b/sources
index 8a315ee..9abb797 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 3aff94e92186e99ed5fd6dcee2db7c74  acpid-1.0.4.tar.gz
+581b7998a78b140ca58c428338c734ed  acpid.power.sh