diff --git a/irqbalance.init b/irqbalance.init
index fc8ef18..9d59a1c 100755
--- a/irqbalance.init
+++ b/irqbalance.init
@@ -43,12 +43,21 @@ esac
 RETVAL=0
 
 start() {
+        if [ -n "$ONESHOT" -a -f /var/lock/irqbalance ]; then
+                exit 0
+        fi
         echo -n $"Starting $prog: "
         daemon irqbalance $ONESHOT
         RETVAL=$?
         echo
-        [ $RETVAL -eq 0 -a -z "$ONESHOT" ] && touch /var/lock/subsys/irqbalance
-	return $RETVAL
+        if [ $RETVAL -eq 0 ]; then
+                if [ -n "$ONESHOT" ]; then
+                        touch /var/lock/subsys/irqbalance
+                else
+                        touch /var/lock/irqbalance
+                fi
+        fi
+        return $RETVAL
 }
 
 
diff --git a/irqbalance.spec b/irqbalance.spec
index 358c62b..e5a58e1 100644
--- a/irqbalance.spec
+++ b/irqbalance.spec
@@ -1,7 +1,7 @@
 Summary:        IRQ balancing daemon.
 Name:           irqbalance
 Version:        1.13
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Epoch:		1
 Group:          System Environment/Base
 License:        GPL/OSL
@@ -72,7 +72,7 @@ exit 0
 
 
 %changelog
-* Wed Sep 13 2006 Peter Jones <pjones@redhat.com> - 1.13-3
+* Wed Sep 13 2006 Peter Jones <pjones@redhat.com> - 1.13-4
 - Fix subsystem locking
 
 * Fri Aug 18 2006 Jesse Keating <jkeating@redhat.com> - 1.13-2