diff --git a/rtems/config/tools/rtems-tools-5-1.cfg b/rtems/config/tools/rtems-tools-5-1.cfg
index a73f5e3e..5a9442ac 100644
--- a/rtems/config/tools/rtems-tools-5-1.cfg
+++ b/rtems/config/tools/rtems-tools-5-1.cfg
@@ -15,9 +15,9 @@
 %endif
 
 %define rtems_tools_source rtems-tools-%{rtems_tools_version}
-%source set rtems-tools https://git.rtems.org/rtems-tools/snapshot/%{rtems_tools_source}.tar.%{rtems_tools_ext}
-%hash   sha512 rtems-tools-%{rtems_tools_version}.tar.bz2 \
-         GlXsp4bTjMc1IzJlvyF1eLBEH5CWVX4Yfm5ER7xrXS0Eh73bhYGYJbUPPaHLNrkLxETnGpRblH/SR2481gI+Rg==
+%source set rtems-tools https://github.com/RTEMS/rtems-tools/archive/%{rtems_tools_version}.zip
+%hash   sha512 %{rtems_tools_version}.zip \
+         c03fd8b7c1163f7ca670428e600a53347839a491fd4cd801ccd93b82210f6c1ec6eb9302de23a2ca627a79d26e1b165b4efe99f4e8ec1922e1e89b64ed04ce5f
 
 #
 # Optionally enable/disable building the RTEMS Tools via the command line.
diff --git a/source-builder/config/autoconf-2-1.cfg b/source-builder/config/autoconf-2-1.cfg
index 86f5d1ed..ac328a6e 100644
--- a/source-builder/config/autoconf-2-1.cfg
+++ b/source-builder/config/autoconf-2-1.cfg
@@ -53,6 +53,11 @@ URL: 	   http://www.gnu.org/software/autoconf/
   fi
   export CFLAGS CFLAGS_FOR_BUILD CC
 
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub -O config.sub
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess -O config.guess
+  mv config.sub build-aux/config.sub
+  mv config.guess build-aux/config.guess
+
   CFLAGS="$SB_CFLAGS" \
   ./configure \
     --build=%{_build} --host=%{_host} \
diff --git a/source-builder/config/automake-1-1.cfg b/source-builder/config/automake-1-1.cfg
index 48beb51f..1109686c 100644
--- a/source-builder/config/automake-1-1.cfg
+++ b/source-builder/config/automake-1-1.cfg
@@ -53,6 +53,11 @@ URL: 	   http://www.gnu.org/software/automake/
   fi
   export CFLAGS CFLAGS_FOR_BUILD CC
 
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub -O config.sub
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess -O config.guess
+  mv config.sub lib/config.sub
+  mv config.guess lib/config.guess
+
   CFLAGS="$SB_CFLAGS" \
   ./configure \
     --build=%{_build} --host=%{_host} \
diff --git a/source-builder/config/expat-2-1.cfg b/source-builder/config/expat-2-1.cfg
index 2219d15c..a86fb0b1 100644
--- a/source-builder/config/expat-2-1.cfg
+++ b/source-builder/config/expat-2-1.cfg
@@ -37,6 +37,11 @@ URL: 	   http://expat.sourceforge.net/
 
   %{host_build_flags}
 
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub -O config.sub
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess -O config.guess
+  mv config.sub conftools/config.sub
+  mv config.guess conftools/config.guess
+
   ./configure \
     --build=%{_build} --host=%{_host} \
     --verbose \
diff --git a/source-builder/config/gdb-common-1.cfg b/source-builder/config/gdb-common-1.cfg
index 96ad6521..b15aad90 100644
--- a/source-builder/config/gdb-common-1.cfg
+++ b/source-builder/config/gdb-common-1.cfg
@@ -228,6 +228,9 @@ URL:       http://www.gnu.org/software/gdb/
 
   %{build_directory}
 
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.sub -O gdb-%{gdb_version}/config.sub
+  wget http://git.savannah.gnu.org/cgit/config.git/plain/config.guess -O gdb-%{gdb_version}/config.guess
+
   mkdir -p ${build_dir}
   cd ${build_dir}