diff --git a/.cvsignore b/.cvsignore
index 2810a63..4b97504 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-acpid-1.0.1.tar.gz
+acpid-1.0.2.tar.gz
diff --git a/acpid.init b/acpid.init
index 4dc4ccc..e647763 100755
--- a/acpid.init
+++ b/acpid.init
@@ -11,8 +11,6 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-DAEMON=acpi
-PROGNAME=${DAEMON}d
 [ -x /usr/sbin/acpid ] || exit 0
 [ -f /proc/acpi/event ] || exit 0
 
@@ -24,22 +22,21 @@ RETVAL=0
 
 start() {
 	# Check if it is already running
-	if [ ! -f /var/lock/subsys/$PROGNAME ]; then
+	if [ ! -f /var/lock/subsys/acpid ]; then
 	    echo -n $"Starting acpi daemon: "
-	    modprobe button > /dev/null 2>&1
-	    daemon /usr/sbin/$PROGNAME
+	    daemon /usr/sbin/acpid
 	    RETVAL=$?
-	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$PROGNAME
+	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/acpid
 	    echo
 	fi
 	return $RETVAL
 }
 
 stop() {
-	echo -n "Stopping $DAEMON daemon: "
-	killproc /usr/sbin/$PROGNAME
+	echo -n $"Stopping acpi daemon: "
+	killproc /usr/sbin/acpid
 	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$PROGNAME
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/acpid
 	echo
         return $RETVAL
 }
@@ -52,7 +49,7 @@ restart() {
 
 reload() {
 	trap "" SIGHUP
-	killall -HUP $PROGNAME
+	killall -HUP acpid
 }	
 
 case "$1" in
@@ -69,12 +66,12 @@ restart)
 	restart
 	;;
 condrestart)
-	if [ -f /var/lock/subsys/$PROGNAME ]; then
+	if [ -f /var/lock/subsys/acpid ]; then
 	    restart
 	fi
 	;;
 status)
-	status $PROGNAME
+	status acpid
 	;;
 *)
 	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
diff --git a/acpid.spec b/acpid.spec
index 1be58c4..54d51d9 100644
--- a/acpid.spec
+++ b/acpid.spec
@@ -1,16 +1,16 @@
 Summary: ACPI Event Daemon
 Name: acpid
-Version: 1.0.1
-Release: 4
+Version: 1.0.2
+Release: 5
 Copyright: GPL
 Group: System Environment/Daemons
-Source: acpid-1.0.1.tar.gz
+Source: http://prdownloads.sourceforge.net/acpid/acpid-%{version}.tar.gz
 Source2: acpid.init
 Patch: acpid-1.0.1-pm1.diff
 Patch2: acpid-1.0.1-conf.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-ExclusiveArch: ia64 i386 x86_64
-URL: http://acpid.sourceforge.net
+ExclusiveArch: ia64 x86_64 i386
+URL: http://acpid.sourceforge.net/
 Prereq: /sbin/chkconfig, /sbin/service
 
 
@@ -46,12 +46,16 @@ install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
 chmod 755 $RPM_BUILD_ROOT/etc/rc.d/init.d/acpid
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %files
 %defattr(-,root,root)
 %dir /etc/acpi
 %dir /etc/acpi/events
 %dir /etc/acpi/actions
-%attr(0644,root,root) /etc/acpi/events/sample.conf
+%config %attr(0644,root,root) /etc/acpi/events/sample.conf
 /var/log/acpid
 /usr/sbin/acpid
 %attr(0755,root,root) /etc/rc.d/init.d/acpid
@@ -68,6 +72,23 @@ if [ "$1" = "0" ]; then
 fi
 
 %changelog
+* Wed Oct 22 2003  Bill Nottingham <notting@redhat.com> 1.0.2-5
+- fix handling of sample.conf (#107160)
+- mark for translations (#107459)
+
+* Sun Oct 19 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- add %%clean specfile target
+
+* Wed Oct  1 2003  Bill Nottingham <notting@redhat.com> 1.0.2-3
+- re-enable x86
+- don't load the button module
+
+* Thu Aug  7 2003  Bill Nottingham <notting@redhat.com> 1.0.2-2
+- no x86 for now
+
+* Mon Jul  7 2003  Bill Nottingham <notting@redhat.com> 1.0.2-1
+- update to 1.0.2
+
 * Wed Dec 11 2002  Bill Nottingham <notting@redhat.com> 1.0.1-4
 - don't start if /proc/acpi/event isn't there
 
diff --git a/sources b/sources
index 225b0d4..33866fa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35c6d7083531956ea963896824190d25  acpid-1.0.1.tar.gz
+15884aaf0b82717954f9366b5c00808b  acpid-1.0.2.tar.gz