diff --git a/repos/base/etc/tools.conf b/repos/base/etc/tools.conf
index a01f219d62..961cf07b0d 100644
--- a/repos/base/etc/tools.conf
+++ b/repos/base/etc/tools.conf
@@ -19,19 +19,19 @@
 # package build tool.
 #
 ifeq ($(filter-out $(SPECS),x86_32),)
-CROSS_DEV_PREFIX ?= /usr/local/genode-gcc/bin/genode-x86-
+CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-x86-
 endif
 ifeq ($(filter-out $(SPECS),x86_64),)
-CROSS_DEV_PREFIX ?= /usr/local/genode-gcc/bin/genode-x86-
+CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-x86-
 endif
 ifeq ($(filter-out $(SPECS),arm),)
-CROSS_DEV_PREFIX ?= /usr/local/genode-gcc/bin/genode-arm-
+CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-arm-
 endif
 ifeq ($(filter-out $(SPECS),riscv),)
-CROSS_DEV_PREFIX ?= /usr/local/genode-gcc/bin/genode-riscv-
+CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-riscv-
 endif
 ifeq ($(filter-out $(SPECS),arm_64),)
-CROSS_DEV_PREFIX ?= /usr/local/genode-gcc/bin/genode-aarch64-
+CROSS_DEV_PREFIX ?= /usr/local/genode/tool/19.05/bin/genode-aarch64-
 endif
 
 #
diff --git a/tool/create_sdk b/tool/create_sdk
index 603ecd77a1..f0c6c39146 100755
--- a/tool/create_sdk
+++ b/tool/create_sdk
@@ -46,7 +46,7 @@ sdk_usage:
 SDK_DIR ?= $(DEFAULT_SDK_DIR_PREFIX)-$(PLATFORM)-$(VERSION)
 DEPOT_USER ?= $(DEFAULT_DEPOT_USER)
 
-TOOLCHAIN_DIR ?= /usr/local/genode-gcc
+TOOLCHAIN_DIR ?= /usr/local/genode/tool/current
 
 #
 # Sanity checks
diff --git a/tool/create_uboot b/tool/create_uboot
index a71d7fd728..24211da4b4 100755
--- a/tool/create_uboot
+++ b/tool/create_uboot
@@ -59,7 +59,7 @@ endif
 
 UBOOT_MAKE := \
 	$(VERBOSE)make ARCH=$(ARCH) \
-	               CROSS_COMPILE=/usr/local/genode-gcc/bin/genode-$(ARCH)- \
+	               CROSS_COMPILE=/usr/local/genode/tool/current/bin/genode-$(ARCH)- \
 	               O=$(UBOOT_BUILD_DIR) \
 	               -j4
 
diff --git a/tool/tool_chain b/tool/tool_chain
index cb6aada9ff..038147e7d6 100755
--- a/tool/tool_chain
+++ b/tool/tool_chain
@@ -63,7 +63,7 @@ BINUTILS_VERSION   = 2.32
 #
 
 DEFAULT_BUILD_LOCATION   = $(GENODE_DIR)/build/tool_chain-$(TOOL_CHAIN_VERSION)
-DEFAULT_INSTALL_LOCATION = /usr/local/genode-gcc
+DEFAULT_INSTALL_LOCATION = /usr/local/genode/tool/$(TOOL_CHAIN_VERSION)
 
 BUILD_LOCATION   ?= $(DEFAULT_BUILD_LOCATION)
 INSTALL_LOCATION ?= $(DEFAULT_INSTALL_LOCATION)
@@ -546,5 +546,9 @@ cleanall: clean
 
 install: build_all
 	$(ECHO) "$(BRIGHT_COL)installing tool chain to '$(INSTALL_LOCATION)'...$(DEFAULT_COL)"
+	$(VERBOSE)$(SUDO) mkdir -p $(INSTALL_LOCATION)
 	$(VERBOSE)$(SUDO) cp -a --remove-destination --no-target-directory $(LOCAL_INSTALL_LOCATION) $(INSTALL_LOCATION)
 	$(VERBOSE)$(LIB_GCC)
+ifeq ($(INSTALL_LOCATION),$(DEFAULT_INSTALL_LOCATION))
+	$(VERBOSE)$(SUDO) ln -snf $(TOOL_CHAIN_VERSION) $(dir $(INSTALL_LOCATION))/current
+endif