diff --git a/setup.sh b/setup.sh
index e56a15912f287a56fc0e338981c9e61c83a48bf7..7fa9e1b0bf198a8d4eaa46f705c1622271b4965f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -3,12 +3,14 @@
 # repos
 LLVM_GIT="http://llvm.org/git/llvm.git"
 CLANG_GIT="http://llvm.org/git/clang.git"
+# branch of LLVM and Clang
+BRANCH="release_38"
+
 # use clang-tools-extra repository from TACLe
 EXTRA_GIT="git@gitlab.cs.fau.de:tacle/tacle-clang-tools-extra.git"
 # EXTRA_GIT="http://llvm.org/git/clang-tools-extra.git"
+EXTRA_BRANCH="release_38_tacle"
 
-# branch/version
-VERSION="release_38"
 
 # source paths
 export BASE=`pwd`
@@ -23,7 +25,7 @@ export LLVM_BUILD="${BASE}/build"
 if ! test -d ${LLVM_SRC}; then
   git clone ${LLVM_GIT} ${LLVM_SRC}
   cd ${LLVM_SRC}
-  git checkout ${VERSION}
+  git checkout ${BRANCH}
   cd ${BASE}
 fi
 
@@ -31,13 +33,16 @@ fi
 if ! test -d ${CLANG_SRC}; then
   git clone ${CLANG_GIT} ${CLANG_SRC}
   cd ${CLANG_SRC}
-  git checkout ${VERSION}
+  git checkout ${BRANCH}
   cd ${BASE}
 fi
 
 # get clang's extras
 if ! test -d ${EXTRA_SRC}; then
   git clone ${EXTRA_GIT} ${EXTRA_SRC}
+  cd ${EXTRA_SRC}
+  git checkout ${EXTRA_BRANCH}
+  cd ${BASE}
 fi