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 fbc1360de5..14203852c8 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
index 455658e3a2..904bdd166a 100755
--- a/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
+++ b/osx/mpkg/Docker CLI.app/Contents/Resources/Scripts/start.sh	
@@ -6,9 +6,15 @@ ISO=$HOME/.docker/machine/cache/boot2docker.iso
 VM=dev
 DOCKER_MACHINE=/usr/local/bin/docker-machine
 
+BLUE='\033[0;34m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
 unset DYLD_LIBRARY_PATH
 unset LD_LIBRARY_PATH
 
+clear
+
 mkdir -p ~/.docker/machine/cache
 if [ ! -f $ISO ]; then
   cp /usr/local/share/boot2docker/boot2docker.iso $ISO
@@ -24,10 +30,9 @@ else
 fi
 
 echo "Starting machine $VM..."
-$DOCKER_MACHINE start dev
+$DOCKER_MACHINE start $VM
 
 echo "Setting environment variables for machine $VM..."
-eval $($DOCKER_MACHINE env dev --shell=bash)
 clear
 
 cat << EOF
@@ -44,7 +49,12 @@ cat << EOF
 
 
 EOF
-echo "The Quick Start CLI is configured to use Docker with the $VM VM"
+echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip dev)${NC}"
 echo
 
-bash -c "$SHELL"
+if [[ $SHELL == *"fish" ]]; then
+  $SHELL -c "eval ($DOCKER_MACHINE env $VM)"
+else
+  $SHELL -c "eval $($DOCKER_MACHINE env $VM)"
+fi
+