diff --git a/atom.sh b/atom.sh
index a8c30fa19..47c902ce9 100755
--- a/atom.sh
+++ b/atom.sh
@@ -55,11 +55,22 @@ if [ $EXPECT_OUTPUT ]; then
 fi
 
 if [ $OS == 'Mac' ]; then
+  if [ -L "$0" ]; then
+    SCRIPT="$(readlink "$0")"
+  else
+    SCRIPT="$0"
+  fi
+  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
+  if [ "$ATOM_APP" == . ]; then
+    unset ATOM_APP
+  else
+    ATOM_PATH="$(dirname "$ATOM_APP")"
+    ATOM_APP_NAME="$(basename "$ATOM_APP")"
+  fi
+
   if [ -n "$BETA_VERSION" ]; then
-    ATOM_APP_NAME="Atom Beta.app"
     ATOM_EXECUTABLE_NAME="Atom Beta"
   else
-    ATOM_APP_NAME="Atom.app"
     ATOM_EXECUTABLE_NAME="Atom"
   fi