diff --git a/config/sources.conf b/config/sources.conf
index 5971246..109921b 100644
--- a/config/sources.conf
+++ b/config/sources.conf
@@ -11,9 +11,7 @@ gcc-aarch64-4.7 svn://gcc.gnu.org/svn/gcc/branches/ARM/aarch64-4.7-branch
 gcc-embedded-4.6 svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_6-branch
 gcc-google-4.6  svn://gcc.gnu.org/svn/gcc/branches/google/gcc-4_6
 #gcc             svn://gcc.gnu.org/svn/gcc/trunk
-gcc-git         git://git.linaro.org/toolchain/gcc.git
-gcc-linaro-4.8  git://git.linaro.org/toolchain/gcc.git/linaro-4.8-branch
-gcc-linaro-4.7  git://git.linaro.org/toolchain/gcc.git/linaro-4.7-branch
+gcc.git         git://git.linaro.org/toolchain/gcc.git
 #gcc-linaro-4.7  lp:gcc-linaro/4.7
 gcc-linaro-4.6  lp:gcc-linaro/4.6
 gdb-linaro-7.6  lp:gdb-linaro/7.6
@@ -23,7 +21,7 @@ cfe             http://llvm.org/svn/llvm-project/cfe/trunk
 
 # Binutils
 binutils.git    git://git.linaro.org/toolchain/binutils.git
-gdb             git://git.linaro.org/toolchain/gdb.git
+gdb.git         git://git.linaro.org/toolchain/gdb.git
 
 # Libraries
 llvm            http://llvm.org/svn/llvm-project/llvm/trunk
@@ -32,18 +30,18 @@ glibc.git       git://git.linaro.org/toolchain/glibc.git
 newlib.git      git://git.linaro.org/toolchain/newlib.git
 libgloss.git    git://git.linaro.org/toolchain/newlib.git
 cortex-strings  lp:cortex-strings
-libav           git://git.libav.org/libav.git
-libffi          git://github.com/atgreen/libffi.git
+libav.git       git://git.libav.org/libav.git
+libffi.git      git://github.com/atgreen/libffi.git
 
 crosstool-ng-linaro lp:~linaro-toolchain-dev/crosstool-ng/linaro
 
-boot-wrapper    git://git.linaro.org/arm/models/boot-wrapper.git
+boot-wrapper.git git://git.linaro.org/arm/models/boot-wrapper.git
 
-bitbake         git://git.openembedded.org/bitbake
+bitbake.git     git://git.openembedded.org/bitbake
 llvm-test-suite http://llvm.org/svn/llvm-project/test-suite/trunk
 
-meta-linaro     git://git.linaro.org/openembedded/meta-linaro.git
-openembedded-core git://git.openembedded.org/openembedded-core
+meta-linaro.git git://git.linaro.org/openembedded/meta-linaro.git
+openembedded-core.git git://git.openembedded.org/openembedded-core
 valgrind        svn://svn.valgrind.org/valgrind/trunk
-qemu            git://git.qemu.org/qemu.git
-qemu-linaro     git://git.linaro.org/qemu/qemu-linaro.git
+qemu.git        git://git.qemu.org/qemu.git
+qemu-linaro.git git://git.linaro.org/qemu/qemu-linaro.git
diff --git a/testsuite/test_sources.conf b/testsuite/test_sources.conf
index 5bde540..109921b 100644
--- a/testsuite/test_sources.conf
+++ b/testsuite/test_sources.conf
@@ -4,10 +4,14 @@
 #
 
 # GCC
+gcc-4.6         svn://gcc.gnu.org/svn/gcc/branches/gcc-4_6-branch
 gcc-4.7         svn://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch
-gcc-git         git://git.linaro.org/toolchain/gcc.git
-gcc-linaro-4.8  git://git.linaro.org/toolchain/gcc.git/linaro-4.8-branch
-gcc-linaro-4.7  git://git.linaro.org/toolchain/gcc.git/linaro-4.7-branch
+gcc-4.8         svn://gcc.gnu.org/svn/gcc/branches/gcc-4_8-branch
+gcc-aarch64-4.7 svn://gcc.gnu.org/svn/gcc/branches/ARM/aarch64-4.7-branch
+gcc-embedded-4.6 svn://gcc.gnu.org/svn/gcc/branches/ARM/embedded-4_6-branch
+gcc-google-4.6  svn://gcc.gnu.org/svn/gcc/branches/google/gcc-4_6
+#gcc             svn://gcc.gnu.org/svn/gcc/trunk
+gcc.git         git://git.linaro.org/toolchain/gcc.git
 #gcc-linaro-4.7  lp:gcc-linaro/4.7
 gcc-linaro-4.6  lp:gcc-linaro/4.6
 gdb-linaro-7.6  lp:gdb-linaro/7.6
@@ -17,7 +21,7 @@ cfe             http://llvm.org/svn/llvm-project/cfe/trunk
 
 # Binutils
 binutils.git    git://git.linaro.org/toolchain/binutils.git
-gdb             git://git.linaro.org/toolchain/gdb.git
+gdb.git         git://git.linaro.org/toolchain/gdb.git
 
 # Libraries
 llvm            http://llvm.org/svn/llvm-project/llvm/trunk
@@ -26,18 +30,18 @@ glibc.git       git://git.linaro.org/toolchain/glibc.git
 newlib.git      git://git.linaro.org/toolchain/newlib.git
 libgloss.git    git://git.linaro.org/toolchain/newlib.git
 cortex-strings  lp:cortex-strings
-libav           git://git.libav.org/libav.git
-libffi          git://github.com/atgreen/libffi.git
+libav.git       git://git.libav.org/libav.git
+libffi.git      git://github.com/atgreen/libffi.git
 
 crosstool-ng-linaro lp:~linaro-toolchain-dev/crosstool-ng/linaro
 
-boot-wrapper    git://git.linaro.org/arm/models/boot-wrapper.git
+boot-wrapper.git git://git.linaro.org/arm/models/boot-wrapper.git
 
-bitbake         git://git.openembedded.org/bitbake
+bitbake.git     git://git.openembedded.org/bitbake
 llvm-test-suite http://llvm.org/svn/llvm-project/test-suite/trunk
 
-meta-linaro     git://git.linaro.org/openembedded/meta-linaro.git
-openembedded-core git://git.openembedded.org/openembedded-core
+meta-linaro.git git://git.linaro.org/openembedded/meta-linaro.git
+openembedded-core.git git://git.openembedded.org/openembedded-core
 valgrind        svn://svn.valgrind.org/valgrind/trunk
-qemu            git://git.qemu.org/qemu.git
-qemu-linaro     git://git.linaro.org/qemu/qemu-linaro.git
+qemu.git        git://git.qemu.org/qemu.git
+qemu-linaro.git git://git.linaro.org/qemu/qemu-linaro.git
