diff --git a/tools/setup_radiohdl.sh b/tools/setup_radiohdl.sh
index 519d99840dba07f9a33dabe6bb8afa49922f17c3..2ff1eae1bc526502abf6a5a643ad4c82c83a81a7 100755
--- a/tools/setup_radiohdl.sh
+++ b/tools/setup_radiohdl.sh
@@ -25,7 +25,14 @@ if [ -z "${RADIOHDL_SH}" ]; then
 export RADIOHDL_SH=true
 echo "Setup RadioHDL environment"
 
+# 1) Usage
+
 # Define $SVN in .bashrc
+# Source this script in the .bashrc to setup the RadioHDL environment for Modelsim and Quartus.
+
+
+# 2) Setup
+
 export UNB=${SVN}/UniBoard_FP7/UniBoard/trunk
 export RADIOHDL=${SVN}/UniBoard_FP7/RadioHDL/trunk
 export HDL_BUILD_DIR=${RADIOHDL}/build
@@ -36,10 +43,10 @@ export ONECLICK=${RADIOHDL}/tools/oneclick
 export PYTHONPATH=${UPE}/base:${UPE}/peripherals:${UPE}/reginfo:${ONECLICK}/base
 
 # Add search paths for executeables to $PATH
-PATH=${PATH}:\
+export PATH=${PATH}:\
+${UPE}/base:\
+${UNB}/Firmware/software/build:\
 ${RADIOHDL}/tools/quartus:\
-${RADIOHDL}/tools/modelsim:\
-${UPE}/base
-export PATH
+${RADIOHDL}/tools/modelsim
 
 fi