Index: /trunk/src/VBox/Installer/solaris/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 51301)
+++ /trunk/src/VBox/Installer/solaris/Makefile.kmk	(revision 51302)
@@ -411,5 +411,6 @@
 	VBoxAutostart \
 	$(if $(VBOX_WITH_WEBSERVICES),vboxwebsrv) \
-	$(if $(VBOX_WITH_WEBSERVICES),webtest)
+	$(if $(VBOX_WITH_WEBSERVICES),webtest) \
+	$(if $(VBOX_WITH_VBOX_IMG)$(VBOX_WITH_TESTCASES),vbox-img)
 
 # Guest Additions
Index: /trunk/src/VBox/Installer/solaris/VBox.sh
===================================================================
--- /trunk/src/VBox/Installer/solaris/VBox.sh	(revision 51301)
+++ /trunk/src/VBox/Installer/solaris/VBox.sh	(revision 51302)
@@ -47,4 +47,7 @@
         exec "$INSTALL_DIR/VBoxQtconfig" "$@"
         ;;
+    vbox-img)
+        exec "$INSTALL_DIR/vbox-img" "$0"
+        ;;
     *)
         echo "Unknown application - $APP"
@@ -53,2 +56,3 @@
 esac
 exit 0
+
Index: /trunk/src/VBox/Installer/solaris/makepackage.sh
===================================================================
--- /trunk/src/VBox/Installer/solaris/makepackage.sh	(revision 51301)
+++ /trunk/src/VBox/Installer/solaris/makepackage.sh	(revision 51302)
@@ -97,4 +97,10 @@
 }
 
+create_hardlink()
+{
+    if test -f "$VBOX_INSTALLED_DIR/amd64/$1" || test -f "$VBOX_INSTALLED_DIR/i386/$1"; then
+        ln -f ./VBoxISAExec "$VBOX_INSTALLED_DIR/$1"
+    fi
+}
 
 # Prepare file list
@@ -109,25 +115,18 @@
 fi
 
-# Create relative hardlinks
+# Create relative hardlinks for executables to either the 32-bit or 64-bit subfolders
 cd "$VBOX_INSTALLED_DIR"
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxManage
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxSDL
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxBalloonCtrl
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxAutostart
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/vboxwebsrv
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/webtest
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxZoneAccess
-ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxSVC
-if test -f $VBOX_INSTALLED_DIR/amd64/VBoxTestOGL || test -f $VBOX_INSTALLED_DIR/i386/VBoxTestOGL; then
-    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxTestOGL
-fi
-
-if test -f $VBOX_INSTALLED_DIR/amd64/VirtualBox || test -f $VBOX_INSTALLED_DIR/i386/VirtualBox; then
-    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VirtualBox
-fi
-if test -f $VBOX_INSTALLED_DIR/amd64/VBoxHeadless || test -f $VBOX_INSTALLED_DIR/i386/VBoxHeadless; then
-    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxHeadless
-    ln -fs ./VBoxHeadless $VBOX_INSTALLED_DIR/VBoxVRDP
-fi
+create_hardlink VBoxManage
+create_hardlink VBoxSDL
+create_hardlink VBoxAutostart
+create_hardlink vboxwebsrv
+create_hardlink webtest
+create_hardlink VBoxZoneAccess
+create_hardlink VBoxSVC
+create_hardlink VBoxBalloonCtrl
+create_hardlink VBoxTestOGL
+create_hardlink VirtualBox
+create_hardlink vbox-img
+create_hardlink VBoxHeadless
 
 # Exclude directories to not cause install-time conflicts with existing system directories
@@ -184,5 +183,5 @@
 dirlist_fixup prototype  '$3 == "var/svc/manifest/application/virtualbox"'                              '$6 = "root"'
 
-# hardening requires some executables to be marked setuid.
+# Hardening requires some executables to be marked setuid.
 if test -n "$HARDENED"; then
     $VBOX_AWK 'NF == 6 \
@@ -233,5 +232,5 @@
 pkgtrans -s -o /var/spool/pkg "`pwd`/$VBOX_PKGFILE" "$VBOX_PKGNAME"
 
-# $5 if exist would contain the path to the VBI package to include in the .tar.gz
+# $5 if exists would contain the path to the VBI package to include in the .tar.gz
 #if [ -f LICENSE ]; then
 #    VBOX_LICENSEFILE=LICENSE