diff --git a/tools/setup_radiohdl.sh b/tools/setup_radiohdl.sh
index 32149229e9c7093ae113d7a2003659f87a72cf3f..877bf6d275767f4d2151533419ef7bba00792054 100755
--- a/tools/setup_radiohdl.sh
+++ b/tools/setup_radiohdl.sh
@@ -23,7 +23,14 @@
 # Only run this script once
 if [ -z "${RADIOHDL_SH}" ]; then
 export RADIOHDL_SH=true
-echo "Setup RadioHDL environment"
+
+if [ ! $1 ]; then
+    radiohdltree="trunk"
+    echo "Setup RadioHDL environment for trunk"
+else
+    radiohdltree=$1
+    echo "Setup RadioHDL environment for $1"
+fi
 
 # 1) Usage
 
@@ -32,10 +39,9 @@ echo "Setup RadioHDL environment"
 
 
 # 2) Setup
-
 export RSP=${SVN}/../Station/trunk/RSP
 export UNB=${SVN}/UniBoard/trunk
-export RADIOHDL=${SVN}/RadioHDL/trunk
+export RADIOHDL=${SVN}/RadioHDL/${radiohdltree}
 export HDL_BUILD_DIR=${RADIOHDL}/build
 
 # Read generic functions/definitions