diff -Naur hotplug-2004_01_05.orig/etc/rc.d/init.d/hotplug hotplug-2004_01_05/etc/rc.d/init.d/hotplug
--- hotplug-2004_01_05.orig/etc/rc.d/init.d/hotplug	2003-03-28 01:25:03.000000000 +0100
+++ hotplug-2004_01_05/etc/rc.d/init.d/hotplug	2004-02-24 00:22:48.000000000 +0100
@@ -14,41 +14,43 @@
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
 # source function library
-if [ -f /etc/init.d/functions ]; then
+if [ -f /etc/init.d/functions ]
+then
 	. /etc/init.d/functions
-elif [ -f /etc/rc.d/init.d/functions ]; then
+elif [ -f /etc/rc.d/init.d/functions ]
+then
 	. /etc/rc.d/init.d/functions
 fi
 
 case "$1" in
     start|restart|status)
-	for RC in /etc/hotplug/*.rc
-	do
-	    $RC $1
-	done
-	touch /var/lock/subsys/hotplug
-	;;
-    stop)
-	for RC in /etc/hotplug/*.rc
-        do
-            $RC stop
-        done
-        rm -f /var/lock/subsys/hotplug
-        ;;
-    force-reload)
-	for RC in /etc/hotplug/*.rc
-        do
-            $RC stop
-        done
-	for RC in /etc/hotplug/*.rc
-        do
-            $RC start
-        done
-        rm -f /var/lock/subsys/hotplug
-        ;;
+		[ -d /var/run/usb ] || mkdir -m 700 /var/run/usb
+		for RC in /etc/hotplug/*.rc
+		do
+	    	HW=`basename $RC .rc | tr [:lower:] [:upper:]`
+			echo "Detecting $HW hardware..."
+			$RC $1
+			evaluate_retval success
+		done
+		;;
+    
+	stop)
+		for RC in /etc/hotplug/*.rc
+		do
+			HW=`basename $RC .rc | tr [:lower:] [:upper:]`
+			echo "Removing $HW hardware support..."
+        	$RC stop
+			evaluate_retval success
+ 		done
+    	;;
+    
+	force-reload)
+    	$0 stop
+		$0 start
+		;;
 
     *)
-	echo $"Usage: $0 {start|stop|restart|status|force_reload}"
-	exit 3
-	;;
+		echo $"Usage: $0 {start|stop|restart|status|force_reload}"
+		exit 3
+		;;
 esac
diff -Naur hotplug-2004_01_05.orig/Makefile hotplug-2004_01_05/Makefile
--- hotplug-2004_01_05.orig/Makefile	2003-06-28 02:13:10.000000000 +0200
+++ hotplug-2004_01_05/Makefile	2004-02-24 00:30:59.000000000 +0100
@@ -91,7 +91,7 @@
 	for F in etc/hotplug/{blacklist,usb.{user,hand,dist}map} ; do \
 	    ${INSTALL_DATA} $$F $(etcdir)/hotplug ; \
 	    done
-	${INSTALL_SCRIPT} -D etc/rc.d/init.d/hotplug $(etcdir)/init.d/hotplug
+	${INSTALL_SCRIPT} -D etc/rc.d/init.d/hotplug $(etcdir)/rc.d/init.d/hotplug
 	$(INSTALL_DATA) -D hotplug.8  $(mandir)/man8/hotplug.8
 	$(INSTALL) -d $(prefix)/var/log/hotplug $(prefix)/var/run
 	$(INSTALL) -d -m 700 $(prefix)/var/run/usb