diff --git a/tools/hdltool.cfg b/tools/hdltool.cfg
index 81dbecad87677075d4bfa6ee06c65c6d530a9da4..104a3fe1f11dab7116ead9c70097f108d04cc9f5 100644
--- a/tools/hdltool.cfg
+++ b/tools/hdltool.cfg
@@ -1,3 +1,3 @@
 tool_name_sim = modelsim
 tool_name_synth = quartus
-model_tech_dir = /home/software/Mentor/modeltech
+model_tech_dir = /home/software/Mentor/6.6c/modeltech
diff --git a/tools/modelsim/modelsim_version.sh b/tools/modelsim/modelsim_version.sh
index 7dcf5a96d058329f8b9a72f94267b1a71b263472..00b6efe0e2545a77cf0edfea18031369fd0facac 100755
--- a/tools/modelsim/modelsim_version.sh
+++ b/tools/modelsim/modelsim_version.sh
@@ -23,11 +23,11 @@
 MODELSIM_VERSION=${1}
 echo "Select Modelsim version: ${MODELSIM_VERSION}"
 
-# First modelsim 6.6c,f was stored at /modeltech, subsequent versions are stored at their /<version number>/modeltech
+## First modelsim 6.6c,f was stored at /modeltech, subsequent versions are stored at their /<version number>/modeltech
 MODELSIM_VERSION_DIR=${MODELSIM_VERSION}
-if [ "${MODELSIM_VERSION}" = "6.6c" ]; then
-  MODELSIM_VERSION_DIR=""
-fi
+#if [ "${MODELSIM_VERSION}" = "6.6c" ]; then
+#  MODELSIM_VERSION_DIR=""
+#fi
 
 # Must not define MODEL_TECH, because it gets defined when the tool starts. Therefore define MODEL_TECH_DIR to denote the modeltech version directory
 export MODEL_TECH_DIR=/home/software/Mentor/${MODELSIM_VERSION_DIR}/modeltech
diff --git a/tools/modelsim/set_modelsim b/tools/modelsim/set_modelsim
index 18553d8e17271fbfc2ba212dba1ac1342875f515..779145c8f85452796c3d6d89ad6035cd2b7e6387 100755
--- a/tools/modelsim/set_modelsim
+++ b/tools/modelsim/set_modelsim
@@ -38,8 +38,8 @@ if [ "${TOOLSET}" = "unb1" ]; then
   . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 6.6c
 elif [ "${TOOLSET}" = "unb2" ]; then
   #. ${RADIOHDL}/tools/quartus/quartus_version.sh 13.1
-  . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.0a10
-  . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.2c
+  . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1
+  . ${RADIOHDL}/tools/modelsim/modelsim_version.sh 10.4
 else
   echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
   exit 1
diff --git a/tools/quartus/set_quartus b/tools/quartus/set_quartus
index 5bf890caac4a3d99e981fdddb93a1ab63774426a..8dc1f4ed318c59d9cfcc45db66ad710c9b18ff25 100755
--- a/tools/quartus/set_quartus
+++ b/tools/quartus/set_quartus
@@ -36,7 +36,7 @@ echo "Make Quartus settings for RadioHDL with tool setting: ${TOOLSET}"
 if [ "${TOOLSET}" = "unb1" ]; then
   . ${RADIOHDL}/tools/quartus/quartus_version.sh 11.1
 elif [ "${TOOLSET}" = "unb2" ]; then
-  . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.0a10
+  . ${RADIOHDL}/tools/quartus/quartus_version.sh 14.1
 else
   echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1' or 'unb2')"
   exit 1