diff --git a/Tools/setup/OSX.sh b/Tools/setup/OSX.sh
index 94c01b5f44a..45f70e7b129 100755
--- a/Tools/setup/OSX.sh
+++ b/Tools/setup/OSX.sh
@@ -1,56 +1,4 @@
 #! /usr/bin/env bash
 
-# script directory
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-
-# Reinstall if --reinstall set
-REINSTALL_FORMULAS=""
-# Install simulation tools?
-INSTALL_SIM=""
-
-# Parse arguments
-for arg in "$@"
-do
-	if [[ $arg == "--reinstall" ]]; then
-		REINSTALL_FORMULAS=$arg
-	elif [[ $arg == "--sim-tools" ]]; then
-		INSTALL_SIM=$arg
-	fi
-done
-
-# install Homebrew
-/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
-
-# Install px4-dev formula
-if [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
-	echo "Re-installing PX4 general dependencies (homebrew px4-dev)"
-
-	# confirm Homebrew installed correctly
-	brew doctor
-
-	brew tap PX4/px4
-	brew reinstall px4-dev
-else
-	if brew ls --versions px4-dev > /dev/null; then
-		echo "px4-dev already installed"
-	else
-		echo "Installing PX4 general dependencies (homebrew px4-dev)"
-		brew tap PX4/px4
-		brew install px4-dev
-	fi
-fi
-
-# Python dependencies
-echo "Installing PX4 Python3 dependencies"
-pip3 install --user -r ${DIR}/requirements.txt
-
-# Optional, but recommended additional simulation tools:
-if [[ $INSTALL_SIM == "--sim-tools" ]]; then
-	if brew ls --versions px4-sim > /dev/null; then
-		brew install px4-sim
-	elif [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
-		brew reinstall px4-sim
-	fi
-fi
-
-echo "All set! PX4 toolchain installed!"
+echo "The script is now called 'macos.sh'."
+exit 1
diff --git a/Tools/setup/macos.sh b/Tools/setup/macos.sh
new file mode 100755
index 00000000000..94c01b5f44a
--- /dev/null
+++ b/Tools/setup/macos.sh
@@ -0,0 +1,56 @@
+#! /usr/bin/env bash
+
+# script directory
+DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+
+# Reinstall if --reinstall set
+REINSTALL_FORMULAS=""
+# Install simulation tools?
+INSTALL_SIM=""
+
+# Parse arguments
+for arg in "$@"
+do
+	if [[ $arg == "--reinstall" ]]; then
+		REINSTALL_FORMULAS=$arg
+	elif [[ $arg == "--sim-tools" ]]; then
+		INSTALL_SIM=$arg
+	fi
+done
+
+# install Homebrew
+/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"
+
+# Install px4-dev formula
+if [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
+	echo "Re-installing PX4 general dependencies (homebrew px4-dev)"
+
+	# confirm Homebrew installed correctly
+	brew doctor
+
+	brew tap PX4/px4
+	brew reinstall px4-dev
+else
+	if brew ls --versions px4-dev > /dev/null; then
+		echo "px4-dev already installed"
+	else
+		echo "Installing PX4 general dependencies (homebrew px4-dev)"
+		brew tap PX4/px4
+		brew install px4-dev
+	fi
+fi
+
+# Python dependencies
+echo "Installing PX4 Python3 dependencies"
+pip3 install --user -r ${DIR}/requirements.txt
+
+# Optional, but recommended additional simulation tools:
+if [[ $INSTALL_SIM == "--sim-tools" ]]; then
+	if brew ls --versions px4-sim > /dev/null; then
+		brew install px4-sim
+	elif [[ $REINSTALL_FORMULAS == "--reinstall" ]]; then
+		brew reinstall px4-sim
+	fi
+fi
+
+echo "All set! PX4 toolchain installed!"