--- src/solaris/bin/imqbrokerd.sh.orig	2011-05-11 17:31:10 UTC
+++ src/solaris/bin/imqbrokerd.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -T
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
@@ -55,6 +55,7 @@ shutdown_broker() {
     # The broker's shutdown hooks will make sure it exits cleanly
     if [ -n "$_javapid" ]; then
         kill -TERM $_javapid
+        wait $_javapid
     fi
 }