diff --git a/mote/tbuisp.in b/mote/tbuisp.in
index 49c41904a6e9138fd0feee92d02dcb69ac5915fe..64f791eb593fa48d20d17030547a66d9094375c0 100755
--- a/mote/tbuisp.in
+++ b/mote/tbuisp.in
@@ -309,6 +309,15 @@ MOTE: foreach my $mote (@motes) {
 	$errors++;
 	warn "Failed to upload code to $mote";
     }
+
+    # XXX - We have to reboot stargates after loading the mote. Disgusting,
+    # there should be some better way
+    if ($upload_method eq "ssh") {
+	if (system("$SSHTB -host $host shutdown -r now")) {
+	    $errors++;
+	    warn "Failed to upload code to $mote";
+	}
+    }
 }
 
 if ($errors) {