diff --git a/rtems/config/tools/rtems-kernel-4.11.cfg b/rtems/config/tools/rtems-kernel-4.11.cfg
index 5d5b708..1a06aef 100644
--- a/rtems/config/tools/rtems-kernel-4.11.cfg
+++ b/rtems/config/tools/rtems-kernel-4.11.cfg
@@ -25,7 +25,11 @@
  %include %{_configdir}/base.cfg
  %include %{_configdir}/versions.cfg
 
- %define rtems_kernel_version 4.11.0-rc1
+ %if %{rsb_released}
+  %define rtems_kernel_version %{rsb_version}
+ %else
+  %define rtems_kernel_version %{rtems_version}
+ %endif
 
  #
  # A magic internal path that would break if changes in the defaults.mc
diff --git a/rtems/config/tools/rtems-tools-4.11-1.cfg b/rtems/config/tools/rtems-tools-4.11-1.cfg
index f1c306d..67f8fe2 100644
--- a/rtems/config/tools/rtems-tools-4.11-1.cfg
+++ b/rtems/config/tools/rtems-tools-4.11-1.cfg
@@ -3,9 +3,13 @@
 #
 
 #
-# Track the release branch.
+# The RTEMS Tools version is set to the RSB version or the RTEMS version.
 #
-%define rtems_tools_version %{rsb_version}
+%if %{rsb_released}
+ %define rtems_tools_version %{rsb_version}
+%else
+ %define rtems_tools_version %{rtems_version}
+%endif
 
 #
 # The RTEMS Tools build instructions. We use GIT Release 1.