diff --git a/osx/mpkg/Distribution b/osx/mpkg/Distribution
index 28341fd641..670d595dad 100644
--- a/osx/mpkg/Distribution
+++ b/osx/mpkg/Distribution
@@ -24,7 +24,7 @@
     <choice id="choiceDockerComposeCLI" title="choiceDockerComposeCLI_title" description="choiceDockerComposeCLI_msg" start_selected="true" start_enabled="true" start_visible="true">
         <pkg-ref id="io.docker.pkg.dockercompose"/>
     </choice>
-    <choice id="choiceBoot2DockerISO" title="choiceBoot2DockerISO_title" description="choiceBoot2DockerISO_msg" start_selected="true" start_enabled="true" start_visible="true">
+    <choice id="choiceBoot2DockerISO" title="choiceBoot2DockerISO_title" description="choiceBoot2DockerISO_msg" start_selected="true" start_enabled="true" start_visible="false">
         <pkg-ref id="io.boot2dockeriso.pkg.boot2dockeriso"/>
     </choice>
     <choice id="choiceDockerCLIAPP" title="choiceDockerCLIAPP_title" description="choiceDockerCLIAPP_msg" start_selected="true" start_enabled="true" start_visible="true">
diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt
index 99aa3c8f7a..53f0f2793e 100644
Binary files a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt and b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/main.scpt differ
diff --git a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh
new file mode 100644
index 0000000000..9bbfddc6d8
--- /dev/null
+++ b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
@@ -0,0 +1,44 @@
+ISO=$HOME/.docker/machine/cache/boot2docker.iso
+VM=dev
+DOCKER_MACHINE=/usr/local/bin/docker-machine
+
+unset DYLD_LIBRARY_PATH
+unset LD_LIBRARY_PATH
+
+mkdir -p ~/.docker/machine/cache
+if [ ! -f $ISO ]; then
+  cp /usr/local/share/boot2docker/boot2docker.iso $ISO
+fi
+
+machine=$($DOCKER_MACHINE ls -q | grep "^$VM$")
+if [ -z $machine ]; then
+  echo "Creating Machine $VM..."
+   $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
+else
+  echo "Machine $VM already exists."
+fi
+
+echo "Starting machine $VM..."
+$DOCKER_MACHINE start dev
+
+echo "Setting environment variables for machine $VM..."
+eval $($DOCKER_MACHINE env dev --shell=bash)
+clear
+
+cat << EOF
+                        ##         .
+                  ## ## ##        ==
+               ## ## ## ## ##    ===
+           /"""""""""""""""""\___/ ===
+      ~~~ {~~ ~~~~ ~~~ ~~~~ ~~~ ~ /  ===- ~~~
+           \______ o           __/
+             \    \         __/
+              \____\_______/
+
+EOF
+echo ""
+echo "Your shell is configured to use docker with the VM: $VM"
+echo "You can ssh into the VM via 'docker-machine ssh $VM'"
+echo ""
+
+bash -c "$SHELL"
diff --git a/osx/mpkg/Resources/toolbox.png b/osx/mpkg/Resources/toolbox.png
index 4b27aa8a1d..974cd9a042 100644
Binary files a/osx/mpkg/Resources/toolbox.png and b/osx/mpkg/Resources/toolbox.png differ
diff --git a/osx/uninstall.sh b/osx/uninstall.sh
index 78b7124efe..4a33ef27e1 100755
--- a/osx/uninstall.sh
+++ b/osx/uninstall.sh
@@ -8,7 +8,7 @@ if [ "${USER}" != "root" ]; then
 fi
 
 echo "Removing dev VirtualBox VM..."
-docker-machine rm -f dev
+docker-machine rm -f $(docker-machine ls -q)
 
 echo "Removing docker binaries..."
 rm -f /usr/local/bin/docker