diff --git a/classes/codebench.bbclass b/classes/codebench.bbclass
new file mode 100644
index 0000000..94bef4c
--- /dev/null
+++ b/classes/codebench.bbclass
@@ -0,0 +1,75 @@
+# If the user hasn't set EXTERNAL_TOOLCHAIN, but CODEBENCH_PATH is set, then
+# we automatically set both EXTERNAL_TOOLCHAIN and EXTERNAL_TARGET_SYS based
+# on the installed toolchains in CODEBENCH_PATH/../toolchains.
+CODEBENCH_PATH ?= ""
+CODEBENCH_TOOLCHAINS_PATH ?= "${CODEBENCH_PATH}/../toolchains"
+
+def auto_codebench_path_fixup(exttc, d):
+    """Fixups for common issues with EXTERNAL_TOOLCHAIN with CodeBench."""
+    if os.path.exists(os.path.join(exttc, 'codebench')):
+        newtc = os.path.join(exttc, 'codebench')
+        if not os.path.exists(os.path.join(newtc, '..', 'toolchains')):
+            bb.warn('EXTERNAL_TOOLCHAIN was set to the root of a codebench install, not the toolchain path')
+            bb.warn('Adjusted EXTERNAL_TOOLCHAIN from `{}` to `{}`'.format(exttc, newtc))
+        exttc = newtc
+        d.setVar('EXTERNAL_TOOLCHAIN', exttc)
+
+    if os.path.exists(os.path.join(exttc, '..', 'toolchains')):
+        bb.warn('Detected CodeBench installation, but CODEBENCH_PATH is not set')
+        bb.warn('Adjusted CODEBENCH_PATH to `{}` and removed EXTERNAL_TOOLCHAIN'.format(exttc))
+        d.setVar('CODEBENCH_PATH', exttc)
+        d.setVar('EXTERNAL_TOOLCHAIN', '')
+
+def set_vars_from_toolchains(codebench_path, d):
+    toolchains_path = d.getVar('CODEBENCH_TOOLCHAINS_PATH', True)
+    if not os.path.exists(toolchains_path):
+        if len(os.listdir(os.path.join(codebench_path, 'bin'))) > 1:
+            bb.warn('CODEBENCH_PATH is set, but the expected toolchains path ({}) does not exist. Defaulting EXTERNAL_TOOLCHAIN to CODEBENCH_PATH, assuming an old codebench version.'.format(toolchains_path))
+        else:
+            bb.fatal('Expected toolchains path `{}` does not exist, please ensure that CODEBENCH_PATH is set to a valid CodeBench installation'.format(toolchains_path))
+
+    required_version = d.getVar('SOURCERY_VERSION_REQUIRED', True)
+    if required_version:
+        required_version = required_version.split('-', 1)[0]
+
+    subdirs = os.listdir(toolchains_path)
+    triplets, toolchain_subdir = [], None
+    for triplet in d.getVar('EXTERNAL_TARGET_SYSTEMS', True).split():
+        if required_version:
+            expected_subdir = triplet + '.' + required_version
+            if expected_subdir in subdirs:
+                triplets.append(triplet)
+                toolchain_subdir = expected_subdir
+        else:
+            for subdir in subdirs:
+                if subdir.startswith(triplet + '.'):
+                    triplets.append(triplet)
+                    toolchain_subdir = subdir
+
+        if triplets:
+            break
+
+    if len(triplets) > 1:
+        bb.fatal('Error: unable to determine which toolchain to use, as multiple are available ({}). Please set EXTERNAL_TOOLCHAIN manually to the appropriate path in `{}`'.format(', '.join(triplets), toolchains_path))
+    elif not triplets:
+        bb.fatal('Unable to locate appropriate toolchain in `{}`, please set EXTERNAL_TOOLCHAIN to the correct toolchain path, or install the required CodeBench version'.format(toolchains_path))
+    else:
+        d.setVar('EXTERNAL_TARGET_SYS', triplets[0])
+        d.setVar('EXTERNAL_TOOLCHAIN', os.path.join(toolchains_path, toolchain_subdir))
+
+python codebench_check () {
+    codebench_path = d.getVar('CODEBENCH_PATH', True)
+    exttc = d.getVar('EXTERNAL_TOOLCHAIN', True)
+    if exttc:
+        if codebench_path:
+            bb.warn('Both EXTERNAL_TOOLCHAIN and CODEBENCH_PATH are set. Ignoring CODEBENCH_PATH in preference to EXTERNAL_TOOLCHAIN')
+            return
+        else:
+            auto_codebench_path_fixup(exttc, d)
+            codebench_path = d.getVar('CODEBENCH_PATH', True)
+
+    if codebench_path:
+        set_vars_from_toolchains(codebench_path, d)
+}
+codebench_check[eventmask] = "bb.event.ConfigParsed"
+addhandler codebench_check
diff --git a/conf/distro/include/tcmode-external-sourcery.inc b/conf/distro/include/tcmode-external-sourcery.inc
index 9ea5974..fd36c9b 100644
--- a/conf/distro/include/tcmode-external-sourcery.inc
+++ b/conf/distro/include/tcmode-external-sourcery.inc
@@ -51,6 +51,9 @@ PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers-external"
 # Support use of an external toolchain with the SDK/ADE/etc
 TOOLCHAIN_TARGET_TASK_append = " sdk-env-external-toolchain"
 
+# Set our vars based on the codebench path, if available
+INHERIT += "codebench"
+
 # Pull in our utility functions for use elsewhere
 INHERIT += "external-common"
 
@@ -80,16 +83,16 @@ PNBLACKLIST_DYNAMIC += "\
 
 # Determine the prefixes to check for based on the target architecture (before
 # any classes alter TARGET_ARCH)
-EXTERNAL_TARGET_SYSTEMS[powerpc] ?= "powerpc-linux-gnu powerpc-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[powerpc64] ?= "powerpc-linux-gnu powerpc-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[arm] ?= "arm-none-linux-gnueabi arm-mentor-linux-gnueabi"
-EXTERNAL_TARGET_SYSTEMS[aarch64] ?= "aarch64-linux-gnu aarch64-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[mips] ?= "mips-linux-gnu mips-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[mipsel] ?= "mips-linux-gnu mips-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[mips64] ?= "mips64-nlm-linux-gnu mips-linux-gnu mips-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[x86_64] ?= "i686-pc-linux-gnu i686-mentor-linux-gnu x86_64-linux-gnu x86_64-amd-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[i686] ?= "i686-pc-linux-gnu i686-mentor-linux-gnu"
-EXTERNAL_TARGET_SYSTEMS[i586] ?= "i686-pc-linux-gnu i686-mentor-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[powerpc] ?= "powerpc-mentor-linux-gnu powerpc-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[powerpc64] ?= "powerpc-mentor-linux-gnu powerpc-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[arm] ?= "arm-mentor-linux-gnueabi arm-none-linux-gnueabi"
+EXTERNAL_TARGET_SYSTEMS[aarch64] ?= "aarch64-mentor-linux-gnu aarch64-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[mips] ?= "mips-mentor-linux-gnu mips-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[mipsel] ?= "mips-mentor-linux-gnu mips-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[mips64] ?= "mips-mentor-linux-gnu mips64-nlm-linux-gnu mips-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[x86_64] ?= "i686-mentor-linux-gnu x86_64-linux-gnu x86_64-amd-linux-gnu i686-pc-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[i686] ?= "i686-mentor-linux-gnu i686-pc-linux-gnu"
+EXTERNAL_TARGET_SYSTEMS[i586] ?= "i686-mentor-linux-gnu i686-pc-linux-gnu"
 EXTERNAL_TARGET_SYSTEMS = "${TARGET_SYS}"
 
 def external_target_sys(d):