diff --git a/rtems/config/tools/rtems-tools-1.cfg b/rtems/config/tools/rtems-tools-1.cfg
index bef9d6b..b03b7ad 100644
--- a/rtems/config/tools/rtems-tools-1.cfg
+++ b/rtems/config/tools/rtems-tools-1.cfg
@@ -38,7 +38,7 @@
    %define rtems_tools_git_checkout %{nil}
   %endif
 
-  %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
+  %source set rtems-tools git://git.rtems.org/rtems-tools.git?reset=hard?fetch?branch=%{rtems_tools_version}?pull%{rtems_tools_git_checkout}
  %endif
 
  #
diff --git a/rtems/config/tools/rtems-tools-common-1.cfg b/rtems/config/tools/rtems-tools-common-1.cfg
index eecd121..3a7f1cf 100644
--- a/rtems/config/tools/rtems-tools-common-1.cfg
+++ b/rtems/config/tools/rtems-tools-common-1.cfg
@@ -10,7 +10,7 @@ Version:   %{rtems_tools_version}
 Release:   %{release}
 URL: 	   http://www.rtems.org/
 BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
-License:   BSD-2-Caluse + GPL-2.0
+License:   BSD-2-Clause + GPL-2.0
 
 #
 # Prepare the source code.
@@ -51,6 +51,19 @@ License:   BSD-2-Caluse + GPL-2.0
 
   %{__rmdir} $SB_BUILD_ROOT
 
+  #
+  # If on Windows we need to add the driver prefix to the built root as waf
+  # strips the driver prefix from the prefix path when joining it to the
+  # destdir path. Waf is correct in doing this and the RSB is design to match
+  # the configure behaviour which treats the whole path including the drive
+  # prefix as part of the path as just a path.
+  #
+  %ifos win32 mingw ming32
+   SB_BUILD_ROOT_WAF=$SB_BUILD_ROOT$(echo %{_prefix} | cut -c 1-2)
+  %else
+   SB_BUILD_ROOT_WAF=$SB_BUILD_ROOT
+  %endif
+
   cd ${source_dir_rtems_tools}
-  ./waf --destdir=$SB_BUILD_ROOT install
+  ./waf --destdir=$SB_BUILD_ROOT_WAF install
   cd ${build_top}