diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk
index eb83318d5..da065dccf 100644
--- a/package/asterisk/asterisk.mk
+++ b/package/asterisk/asterisk.mk
@@ -3,9 +3,9 @@
 # asterisk
 #
 ##############################################################
-ASTERISK_VERSION:=1.2.0-beta1
+ASTERISK_VERSION:=1.6.0-beta6
 ASTERISK_SOURCE:=asterisk-$(ASTERISK_VERSION).tar.gz
-ASTERISK_SITE:=ftp://ftp.digium.com/pub/asterisk/old-releases
+ASTERISK_SITE:=http://downloads.digium.com/pub/asterisk/old-releases
 ASTERISK_DIR:=$(BUILD_DIR)/asterisk-$(ASTERISK_VERSION)
 ASTERISK_BINARY:=asterisk
 ASTERISK_TARGET_BINARY:=usr/sbin/asterisk
diff --git a/package/autoconf/autoconf.mk b/package/autoconf/autoconf.mk
index 0d73f7576..b2857e97c 100644
--- a/package/autoconf/autoconf.mk
+++ b/package/autoconf/autoconf.mk
@@ -5,7 +5,7 @@
 #############################################################
 AUTOCONF_VERSION:=2.61
 AUTOCONF_SOURCE:=autoconf-$(AUTOCONF_VERSION).tar.bz2
-AUTOCONF_SITE:=$(BR2_GNU_MIRROR)/gnu/autoconf
+AUTOCONF_SITE:=$(BR2_GNU_MIRROR)/autoconf
 AUTOCONF_CAT:=$(BZCAT)
 AUTOCONF_SRC_DIR:=$(TOOL_BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)
 AUTOCONF_DIR:=$(BUILD_DIR)/autoconf-$(AUTOCONF_VERSION)
diff --git a/package/automake/automake.mk b/package/automake/automake.mk
index 928a55b96..2fac0129f 100644
--- a/package/automake/automake.mk
+++ b/package/automake/automake.mk
@@ -5,7 +5,7 @@
 #############################################################
 AUTOMAKE_VERSION:=1.10
 AUTOMAKE_SOURCE:=automake-$(AUTOMAKE_VERSION).tar.bz2
-AUTOMAKE_SITE:=$(BR2_GNU_MIRROR)/gnu/automake
+AUTOMAKE_SITE:=$(BR2_GNU_MIRROR)/automake
 AUTOMAKE_CAT:=$(BZCAT)
 AUTOMAKE_SRC_DIR:=$(TOOL_BUILD_DIR)/automake-$(AUTOMAKE_VERSION)
 AUTOMAKE_DIR:=$(BUILD_DIR)/automake-$(AUTOMAKE_VERSION)
diff --git a/package/bash/bash.mk b/package/bash/bash.mk
index 9447f8a1b..d8170ea65 100644
--- a/package/bash/bash.mk
+++ b/package/bash/bash.mk
@@ -5,7 +5,7 @@
 #############################################################
 BASH_VERSION:=3.2
 BASH_SOURCE:=bash-$(BASH_VERSION).tar.gz
-BASH_SITE:=$(BR2_GNU_MIRROR)/gnu/bash
+BASH_SITE:=$(BR2_GNU_MIRROR)/bash
 BASH_CAT:=$(ZCAT)
 BASH_DIR:=$(BUILD_DIR)/bash-$(BASH_VERSION)
 BASH_BINARY:=bash
diff --git a/package/bison/bison.mk b/package/bison/bison.mk
index edabc24a2..3bc156d5d 100644
--- a/package/bison/bison.mk
+++ b/package/bison/bison.mk
@@ -5,7 +5,7 @@
 #############################################################
 BISON_VERSION:=2.3
 BISON_SOURCE:=bison-$(BISON_VERSION).tar.bz2
-BISON_SITE:=$(BR2_GNU_MIRROR)/gnu/bison
+BISON_SITE:=$(BR2_GNU_MIRROR)/bison
 BISON_DIR:=$(BUILD_DIR)/bison-$(BISON_VERSION)
 BISON_CAT:=$(BZCAT)
 BISON_BINARY:=src/bison
diff --git a/package/classpath/classpath.mk b/package/classpath/classpath.mk
index af3c4095f..dfb69bea5 100644
--- a/package/classpath/classpath.mk
+++ b/package/classpath/classpath.mk
@@ -5,7 +5,7 @@
 #############################################################
 CLASSPATH_VERSION = 0.96.1
 CLASSPATH_SOURCE = classpath-$(CLASSPATH_VERSION).tar.gz
-CLASSPATH_SITE = ftp://ftp.gnu.org/gnu/classpath/
+CLASSPATH_SITE = $(BR2_GNU_MIRROR)/classpath
 CLASSPATH_AUTORECONF = NO
 CLASSPATH_INSTALL_STAGING = YES
 CLASSPATH_INSTALL_TARGET = YES
diff --git a/package/coreutils/coreutils.mk b/package/coreutils/coreutils.mk
index 541c69701..8ee86e0f1 100644
--- a/package/coreutils/coreutils.mk
+++ b/package/coreutils/coreutils.mk
@@ -6,7 +6,7 @@
 COREUTILS_VERSION:=6.9
 COREUTILS_SOURCE:=coreutils-$(COREUTILS_VERSION).tar.bz2
 #COREUTILS_SITE:=ftp://alpha.gnu.org/gnu/coreutils/
-COREUTILS_SITE:=$(BR2_GNU_MIRROR)/gnu/coreutils
+COREUTILS_SITE:=$(BR2_GNU_MIRROR)/coreutils
 COREUTILS_CAT:=$(BZCAT)
 COREUTILS_DIR:=$(BUILD_DIR)/coreutils-$(COREUTILS_VERSION)
 COREUTILS_BINARY:=src/vdir
diff --git a/package/diffutils/diffutils.mk b/package/diffutils/diffutils.mk
index 5963bc62c..0243c98cc 100644
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@@ -6,7 +6,7 @@
 DIFFUTILS_VERSION=2.8.7
 DIFFUTILS_SOURCE:=diffutils-$(DIFFUTILS_VERSION).tar.gz
 #DIFFUTILS_SITE:=ftp://alpha.gnu.org/gnu/diffutils/
-DIFFUTILS_SITE:=$(BR2_GNU_MIRROR)/gnu/diffutils
+DIFFUTILS_SITE:=$(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_CAT:=$(ZCAT)
 DIFFUTILS_DIR:=$(BUILD_DIR)/diffutils-$(DIFFUTILS_VERSION)
 DIFFUTILS_BINARY:=src/diff
diff --git a/package/findutils/findutils.mk b/package/findutils/findutils.mk
index 15c0962d8..5c171072d 100644
--- a/package/findutils/findutils.mk
+++ b/package/findutils/findutils.mk
@@ -6,7 +6,7 @@
 FINDUTILS_VERSION:=4.2.31
 FINDUTILS_SOURCE:=findutils-$(FINDUTILS_VERSION).tar.gz
 #FINDUTILS_SITE:=ftp://alpha.gnu.org/gnu/findutils
-FINDUTILS_SITE:=$(BR2_GNU_MIRROR)/gnu/findutils/
+FINDUTILS_SITE:=$(BR2_GNU_MIRROR)/findutils/
 FINDUTILS_CAT:=$(ZCAT)
 FINDUTILS_DIR:=$(BUILD_DIR)/findutils-$(FINDUTILS_VERSION)
 FINDUTILS_BINARY:=find/find
diff --git a/package/gawk/gawk.mk b/package/gawk/gawk.mk
index 87bce1680..8efc5ec71 100644
--- a/package/gawk/gawk.mk
+++ b/package/gawk/gawk.mk
@@ -5,7 +5,7 @@
 #############################################################
 GAWK_VERSION:=3.1.5
 GAWK_SOURCE:=gawk-$(GAWK_VERSION).tar.bz2
-GAWK_SITE:=$(BR2_GNU_MIRROR)/gnu/gawk
+GAWK_SITE:=$(BR2_GNU_MIRROR)/gawk
 GAWK_CAT:=$(BZCAT)
 GAWK_DIR:=$(BUILD_DIR)/gawk-$(GAWK_VERSION)
 GAWK_BINARY:=gawk
diff --git a/package/gettext/gettext.mk b/package/gettext/gettext.mk
index 46a99bf85..802da2fb7 100644
--- a/package/gettext/gettext.mk
+++ b/package/gettext/gettext.mk
@@ -5,7 +5,7 @@
 #############################################################
 GETTEXT_VERSION:=0.16.1
 GETTEXT_SOURCE:=gettext-$(GETTEXT_VERSION).tar.gz
-GETTEXT_SITE:=$(BR2_GNU_MIRROR)/gnu/gettext
+GETTEXT_SITE:=$(BR2_GNU_MIRROR)/gettext
 GETTEXT_DIR:=$(BUILD_DIR)/gettext-$(GETTEXT_VERSION)
 GETTEXT_CAT:=$(ZCAT)
 GETTEXT_BINARY:=gettext-runtime/src/gettext
diff --git a/package/gnuchess/gnuchess.mk b/package/gnuchess/gnuchess.mk
index 8a64d898a..236ba73a6 100644
--- a/package/gnuchess/gnuchess.mk
+++ b/package/gnuchess/gnuchess.mk
@@ -5,7 +5,7 @@
 #############################################################
 GNUCHESS_VERSION = 5.07
 GNUCHESS_SOURCE = gnuchess-$(GNUCHESS_VERSION).tar.gz
-GNUCHESS_SITE = http://ftp.gnu.org/pub/gnu/chess
+GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess
 GNUCHESS_AUTORECONF = NO
 GNUCHESS_INSTALL_STAGING = NO
 GNUCHESS_INSTALL_TARGET = YES
diff --git a/package/gzip/gzip.mk b/package/gzip/gzip.mk
index e65737291..582270e63 100644
--- a/package/gzip/gzip.mk
+++ b/package/gzip/gzip.mk
@@ -6,7 +6,7 @@
 GZIP_VERSION:=1.3.5
 GZIP_SOURCE:=gzip-$(GZIP_VERSION).tar.gz
 #GZIP_SITE:=ftp://alpha.gnu.org/gnu/gzip
-GZIP_SITE:=$(BR2_GNU_MIRROR)/gnu/gzip
+GZIP_SITE:=$(BR2_GNU_MIRROR)/gzip
 GZIP_DIR:=$(BUILD_DIR)/gzip-$(GZIP_VERSION)
 GZIP_CAT:=$(ZCAT)
 GZIP_BINARY:=$(GZIP_DIR)/gzip
diff --git a/package/libtool/libtool.mk b/package/libtool/libtool.mk
index 591a7a3e9..fc97a3136 100644
--- a/package/libtool/libtool.mk
+++ b/package/libtool/libtool.mk
@@ -5,7 +5,7 @@
 #############################################################
 LIBTOOL_VERSION:=1.5.24
 LIBTOOL_SOURCE:=libtool-$(LIBTOOL_VERSION).tar.gz
-LIBTOOL_SITE:=$(BR2_GNU_MIRROR)/gnu/libtool
+LIBTOOL_SITE:=$(BR2_GNU_MIRROR)/libtool
 LIBTOOL_CAT:=$(ZCAT)
 LIBTOOL_SRC_DIR:=$(TOOL_BUILD_DIR)/libtool-$(LIBTOOL_VERSION)
 LIBTOOL_DIR:=$(BUILD_DIR)/libtool-$(LIBTOOL_VERSION)
diff --git a/package/m4/m4.mk b/package/m4/m4.mk
index d25a8a168..570f9acd1 100644
--- a/package/m4/m4.mk
+++ b/package/m4/m4.mk
@@ -6,7 +6,7 @@
 M4_VERSION:=1.4.9
 M4_SOURCE:=m4-$(M4_VERSION).tar.bz2
 M4_CAT:=$(BZCAT)
-M4_SITE:=$(BR2_GNU_MIRROR)/gnu/m4
+M4_SITE:=$(BR2_GNU_MIRROR)/m4
 M4_DIR:=$(BUILD_DIR)/m4-$(M4_VERSION)
 M4_HOST_DIR:=$(TOOL_BUILD_DIR)/m4-$(M4_VERSION)
 M4_BINARY:=m4
diff --git a/package/make/make.mk b/package/make/make.mk
index 7f83293bb..4f11f504d 100644
--- a/package/make/make.mk
+++ b/package/make/make.mk
@@ -5,7 +5,7 @@
 #############################################################
 GNUMAKE_VERSION:=3.81
 GNUMAKE_SOURCE:=make-$(GNUMAKE_VERSION).tar.bz2
-GNUMAKE_SITE:=$(BR2_GNU_MIRROR)/gnu/make
+GNUMAKE_SITE:=$(BR2_GNU_MIRROR)/make
 GNUMAKE_DIR:=$(BUILD_DIR)/make-$(GNUMAKE_VERSION)
 GNUMAKE_CAT:=$(BZCAT)
 GNUMAKE_BINARY:=make
diff --git a/package/ncurses/ncurses.mk b/package/ncurses/ncurses.mk
index 009dc86b2..51d679e4d 100644
--- a/package/ncurses/ncurses.mk
+++ b/package/ncurses/ncurses.mk
@@ -24,7 +24,7 @@
 
 # TARGETS
 NCURSES_VERSION:=5.6
-NCURSES_SITE:=$(BR2_GNU_MIRROR)/gnu/ncurses
+NCURSES_SITE:=$(BR2_GNU_MIRROR)/ncurses
 NCURSES_DIR:=$(BUILD_DIR)/ncurses-$(NCURSES_VERSION)
 NCURSES_SOURCE:=ncurses-$(NCURSES_VERSION).tar.gz
 NCURSES_CAT:=$(ZCAT)
diff --git a/package/sed/sed.mk b/package/sed/sed.mk
index db3854046..bac7d3332 100644
--- a/package/sed/sed.mk
+++ b/package/sed/sed.mk
@@ -5,7 +5,7 @@
 #############################################################
 SED_VERSION:=4.1.5
 SED_SOURCE:=sed-$(SED_VERSION).tar.gz
-SED_SITE:=$(BR2_GNU_MIRROR)/gnu/sed
+SED_SITE:=$(BR2_GNU_MIRROR)/sed
 SED_CAT:=$(ZCAT)
 SED_DIR1:=$(TOOL_BUILD_DIR)/sed-$(SED_VERSION)
 SED_DIR2:=$(BUILD_DIR)/sed-$(SED_VERSION)
diff --git a/package/tar/tar.mk b/package/tar/tar.mk
index 5f4bd0456..ff7ee3a22 100644
--- a/package/tar/tar.mk
+++ b/package/tar/tar.mk
@@ -5,7 +5,7 @@
 #############################################################
 GNUTAR_VERSION:=1.18
 GNUTAR_SOURCE:=tar-$(GNUTAR_VERSION).tar.bz2
-GNUTAR_SITE:=$(BR2_GNU_MIRROR)/gnu/tar/
+GNUTAR_SITE:=$(BR2_GNU_MIRROR)/tar/
 GNUTAR_DIR:=$(BUILD_DIR)/tar-$(GNUTAR_VERSION)
 GNUTAR_CAT:=$(BZCAT)
 GNUTAR_BINARY:=src/tar
diff --git a/package/wget/wget.mk b/package/wget/wget.mk
index 5e22a5c58..65be610e1 100644
--- a/package/wget/wget.mk
+++ b/package/wget/wget.mk
@@ -5,7 +5,7 @@
 #############################################################
 WGET_VERSION:=1.10.2
 WGET_SOURCE:=wget-$(WGET_VERSION).tar.gz
-WGET_SITE:=$(BR2_GNU_MIRROR)/gnu/wget
+WGET_SITE:=$(BR2_GNU_MIRROR)/wget
 WGET_DIR:=$(BUILD_DIR)/wget-$(WGET_VERSION)
 WGET_CAT:=$(ZCAT)
 WGET_BINARY:=src/wget
diff --git a/package/xboard/xboard.mk b/package/xboard/xboard.mk
index e1cf70ca7..100726639 100644
--- a/package/xboard/xboard.mk
+++ b/package/xboard/xboard.mk
@@ -5,7 +5,7 @@
 #############################################################
 XBOARD_VERSION = 4.2.7
 XBOARD_SOURCE = xboard-$(XBOARD_VERSION).tar.gz
-XBOARD_SITE = http://ftp.gnu.org/gnu/xboard
+XBOARD_SITE = $(BR2_GNU_MIRROR)/xboard
 XBOARD_AUTORECONF = NO
 XBOARD_INSTALL_STAGING = NO
 XBOARD_INSTALL_TARGET = YES