diff --git a/acpid.changes b/acpid.changes
index b457e59..ac82f49 100644
--- a/acpid.changes
+++ b/acpid.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Apr 24 14:27:55 CEST 2007 - trenn@suse.de
+
+- compile some more files with rpm_opt flags
+- remove/fix:
+   +E: acpid unknown-lsb-tag # X-UnitedLinux-Should-Start:
+   +E: acpid unknown-lsb-tag # X-UnitedLinux-Should-Stop:
+
 -------------------------------------------------------------------
 Tue Apr 10 12:51:04 CEST 2007 - hmacht@suse.de
 
diff --git a/acpid.spec b/acpid.spec
index 3e31972..d623507 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -13,7 +13,7 @@
 Name:           acpid
 URL:            http://acpid.sourceforge.net/
 Version:        1.0.4
-Release:        65
+Release:        68
 %define       acpi_version 0.09
 License:        GNU General Public License (GPL)
 Group:          System/Daemons
@@ -68,7 +68,7 @@ make EXTRA_CFLAGS="$RPM_OPT_FLAGS -DUSE_SYSLOG"
 pushd acpi-%{acpi_version}
 ln -sf /usr/share/automake*/install-sh install-sh
 ./configure
-make EXTRA_CFLAGS="$RPM_OPT_FLAGS"
+make CFLAGS="$RPM_OPT_FLAGS"
 popd
 
 %install
@@ -116,6 +116,11 @@ rm -f -- var/lib/acpi/*
 %dir %attr(0750, root, root) /var/lib/acpi
 
 %changelog
+* Tue Apr 24 2007 - trenn@suse.de
+- compile some more files with rpm_opt flags
+- remove/fix:
+  +E: acpid unknown-lsb-tag # X-UnitedLinux-Should-Start:
+  +E: acpid unknown-lsb-tag # X-UnitedLinux-Should-Stop:
 * Tue Apr 10 2007 - hmacht@suse.de
 - add modules dock and bay to probed laptop modules
 * Thu Mar 29 2007 - rguenther@suse.de
diff --git a/rcacpid b/rcacpid
index b6805ed..829c368 100644
--- a/rcacpid
+++ b/rcacpid
@@ -14,9 +14,7 @@
 ### BEGIN INIT INFO
 # Provides:                   acpid
 # Required-Start:
-# X-UnitedLinux-Should-Start:
 # Required-Stop:
-# X-UnitedLinux-Should-Stop:
 # Default-Start:              2 3 5
 # Default-Stop:               0 1 6
 # Short-Description: Listen and dispatch ACPI events from the kernel