diff --git a/tools/quartus/set_quartus b/tools/quartus/set_quartus
index 9736b6dd51943da0d7f7685a52212ff2ba1695ef..e5f3b19024b7689dd61975bd4c2c6b22f5814ebe 100755
--- a/tools/quartus/set_quartus
+++ b/tools/quartus/set_quartus
@@ -69,7 +69,30 @@ else # default site
   elif [ "${TOOLSET}" = "unb2" ]; then
     . ${RADIOHDL}/tools/quartus/quartus_version.sh 15.0
   elif [ "${TOOLSET}" = "unb2a" ]; then
-    . ${RADIOHDL}/tools/quartus/quartus_version.sh 15.1
+#    . ${RADIOHDL}/tools/quartus/quartus_version.sh 15.1
+    . ${RADIOHDL}/tools/quartus/quartus_version.sh 16.0
+
+#    # Begin: For 16.0-pro only:
+#    . ${RADIOHDL}/tools/quartus/quartus_version.sh 16.0-pro
+#    export QUARTUS_ROOTDIR=${QUARTUS_DIR}/quartus
+#    export QUARTUS_ROOTDIR_OVERRIDE=${QUARTUS_DIR}/quartus
+#    export NIOSDIR=${QUARTUS_DIR}/nios2eds
+#    export SOPC_KIT_NIOS2=${NIOSDIR}
+#    # Add to the $PATH, only once to avoid double entries
+#    pathadd ${QUARTUS_ROOTDIR}/bin
+#    pathadd ${QUARTUS_ROOTDIR}/sopc_builder/bin
+#    pathadd ${NIOSDIR}/bin
+#    pathadd ${NIOSDIR}/bin/gnu/H-i686-pc-linux-gnu/bin
+#    pathadd ${NIOSDIR}/bin/gnu/H-x86_64-pc-linux-gnu/bin
+#    pathadd ${NIOSDIR}/sdk2/bin
+#    # Qsys
+#    export ALTERA_HW_TCL_KEEP_TEMP_FILES=1
+#    # User synthesis timestamp in FPGA image
+#    export UNB_COMPILE_STAMPS=1
+#    export RADIOHDL_SVN_REVISION=`svn info ${RADIOHDL} | grep Revision`
+#    unset QUARTUS_DIR # <-- this is required otherwise run_qsys crashes with Java error
+#    return
+#    # End: For 16.0-pro only.
   else
     echo "error: unknown tool setting: ${TOOLSET} (choose 'unb1', 'unb2' or 'unb2a')"
     exit 1