diff --git a/etc/rc b/etc/rc
index dcff4d114..b030077ba 100755
--- a/etc/rc
+++ b/etc/rc
@@ -200,6 +200,11 @@ down|stop)
 	/usr/pkg/etc/rc.d/usbd stop
     fi
 
+    if [ -x /usr/sbin/usbd ]
+    then
+	service down usbd
+    fi
+
     # Tell RS server we're going down.
     service shutdown
     ;;
diff --git a/etc/usr/rc b/etc/usr/rc
index 225bb6c0e..e7581d486 100644
--- a/etc/usr/rc
+++ b/etc/usr/rc
@@ -282,6 +282,11 @@ start|autoboot)
 				# fb hasn't been ported to AM335X yet.
 			fi
 
+			if [ -e /usr/sbin/usbd ]
+			then
+				echo "Starting USBD"
+				up usbd
+			fi
 			# Detect expansion boards and start drivers.
 			capemgr
 
@@ -310,6 +315,11 @@ start|autoboot)
 			#up fb -dev /dev/fb0 -args edid.0=tda19988.1.3470
 			# fb hasn't been ported to AM335X yet.
 
+			if [ -e /usr/sbin/usbd ]
+			then
+				echo "Starting USBD"
+				up usbd
+			fi
 			# Detect expansion boards and start drivers.
 			capemgr