From 0ee87141291bcfaff943f4b0195221ccf6466553 Mon Sep 17 00:00:00 2001
From: Jose V Beneyto <sepen@crux.nu>
Date: Fri, 12 Nov 2010 12:03:50 +0100
Subject: [PATCH] replaced all broken dl.sourceforge.net links to
 download.sourceforge.net

---
 aalib/Pkgfile               | 2 +-
 abe/Pkgfile                 | 2 +-
 acpid/Pkgfile               | 2 +-
 allegro/Pkgfile             | 2 +-
 amsn/Pkgfile                | 2 +-
 aqsis/Pkgfile               | 2 +-
 arpon/Pkgfile               | 2 +-
 atanks/Pkgfile              | 2 +-
 avifile/Pkgfile             | 2 +-
 baras/Pkgfile               | 2 +-
 bftpd/Pkgfile               | 2 +-
 bmp/Pkgfile                 | 2 +-
 bomberclone/Pkgfile         | 2 +-
 boost-jam/Pkgfile           | 2 +-
 boost/Pkgfile               | 2 +-
 bridge-utils/Pkgfile        | 2 +-
 cdrdao/Pkgfile              | 2 +-
 clamav/Pkgfile              | 2 +-
 claws-mail/Pkgfile          | 2 +-
 cramfs-tools/Pkgfile        | 2 +-
 cryptcat/Pkgfile            | 2 +-
 ddclient/Pkgfile            | 2 +-
 denyhosts/Pkgfile           | 2 +-
 djview4/Pkgfile             | 2 +-
 djvulibre/Pkgfile           | 2 +-
 docutils/Pkgfile            | 2 +-
 dvdauthor/Pkgfile           | 2 +-
 ebtables/Pkgfile            | 2 +-
 em8300/Pkgfile              | 2 +-
 ethtool/Pkgfile             | 2 +-
 extremetuxracer/Pkgfile     | 2 +-
 faac/Pkgfile                | 2 +-
 faad2/Pkgfile               | 2 +-
 feedparser/Pkgfile          | 2 +-
 ffe/Pkgfile                 | 2 +-
 fluxbox/Pkgfile             | 2 +-
 freeciv/Pkgfile             | 2 +-
 fsam7440-console/Pkgfile    | 2 +-
 ftgl/Pkgfile                | 2 +-
 fuse-python/Pkgfile         | 2 +-
 gcolor2/Pkgfile             | 2 +-
 gdc/Pkgfile                 | 2 +-
 gift-gnutella/Pkgfile       | 2 +-
 gift-openft/Pkgfile         | 2 +-
 gift/Pkgfile                | 2 +-
 giftoxic/Pkgfile            | 2 +-
 gtk-recordmydesktop/Pkgfile | 2 +-
 heme/Pkgfile                | 2 +-
 id3lib/Pkgfile              | 2 +-
 inadyn-mt/Pkgfile           | 2 +-
 ipmitool/Pkgfile            | 2 +-
 ipsec-tools/Pkgfile         | 2 +-
 jamvm/Pkgfile               | 2 +-
 jedit/Pkgfile               | 2 +-
 kvm/Pkgfile                 | 2 +-
 libcddb/Pkgfile             | 2 +-
 libcgi/Pkgfile              | 2 +-
 libdnet/Pkgfile             | 2 +-
 libdv/Pkgfile               | 2 +-
 libetpan/Pkgfile            | 2 +-
 libfame/Pkgfile             | 2 +-
 libmcrypt/Pkgfile           | 2 +-
 libmodplug/Pkgfile          | 2 +-
 libmpdclient/Pkgfile        | 2 +-
 libnids/Pkgfile             | 2 +-
 libquicktime/Pkgfile        | 2 +-
 libvisual/Pkgfile           | 2 +-
 licq/Pkgfile                | 2 +-
 lirc/Pkgfile                | 2 +-
 lmms/Pkgfile                | 2 +-
 menumaker/Pkgfile           | 2 +-
 miau/Pkgfile                | 2 +-
 mjpegtools/Pkgfile          | 2 +-
 mldonkey/Pkgfile            | 2 +-
 mpc/Pkgfile                 | 2 +-
 mpd/Pkgfile                 | 2 +-
 mrxvt/Pkgfile               | 2 +-
 muttprint/Pkgfile           | 2 +-
 ncmpc/Pkgfile               | 2 +-
 ndiswrapper/Pkgfile         | 2 +-
 net-snmp/Pkgfile            | 2 +-
 nmon/Pkgfile                | 2 +-
 numarray/Pkgfile            | 2 +-
 numeric/Pkgfile             | 2 +-
 ode/Pkgfile                 | 2 +-
 opencore-amr/Pkgfile        | 2 +-
 openmortal/Pkgfile          | 2 +-
 pptp/Pkgfile                | 2 +-
 preload/Pkgfile             | 2 +-
 psi-im/Pkgfile              | 2 +-
 psyco/Pkgfile               | 2 +-
 pwgen/Pkgfile               | 2 +-
 pyopengl/Pkgfile            | 2 +-
 pyopenssl/Pkgfile           | 2 +-
 pyserial/Pkgfile            | 2 +-
 python-markdown/Pkgfile     | 2 +-
 qemu-kvm/Pkgfile            | 2 +-
 qingy-themepack/Pkgfile     | 2 +-
 qingy/Pkgfile               | 2 +-
 quesoglc/Pkgfile            | 2 +-
 rdesktop/Pkgfile            | 2 +-
 recordmydesktop/Pkgfile     | 2 +-
 rhapsody/Pkgfile            | 2 +-
 rss-glx/Pkgfile             | 2 +-
 scorched3d/Pkgfile          | 2 +-
 scribus/Pkgfile             | 2 +-
 sdl_pango/Pkgfile           | 2 +-
 setserial/Pkgfile           | 2 +-
 sntop/Pkgfile               | 2 +-
 sox/Pkgfile                 | 2 +-
 squashfs-tools/Pkgfile      | 2 +-
 streamripper/Pkgfile        | 2 +-
 tagtool/Pkgfile             | 2 +-
 tcl/Pkgfile                 | 2 +-
 tilda/Pkgfile               | 2 +-
 timidity/Pkgfile            | 2 +-
 tk/Pkgfile                  | 2 +-
 tmw/Pkgfile                 | 2 +-
 transcode/Pkgfile           | 2 +-
 vba/Pkgfile                 | 2 +-
 videotrans/Pkgfile          | 2 +-
 warzone2100/Pkgfile         | 2 +-
 wesnoth-server/Pkgfile      | 2 +-
 wesnoth/Pkgfile             | 2 +-
 wmakerconf/Pkgfile          | 2 +-
 wxpython/Pkgfile            | 2 +-
 xine-lib/Pkgfile            | 2 +-
 xine-ui/Pkgfile             | 2 +-
 xmltv/Pkgfile               | 2 +-
 xplanet/Pkgfile             | 2 +-
 zabbix_agentd/Pkgfile       | 2 +-
 zabbix_server/Pkgfile       | 2 +-
 zabbix_utils/Pkgfile        | 2 +-
 zsnes/Pkgfile               | 2 +-
 134 files changed, 134 insertions(+), 134 deletions(-)

diff --git a/aalib/Pkgfile b/aalib/Pkgfile
index eaafb70fa..207de9c2e 100644
--- a/aalib/Pkgfile
+++ b/aalib/Pkgfile
@@ -6,7 +6,7 @@
 name=aalib
 version=1.4rc5
 release=1
-source=(http://dl.sourceforge.net/sourceforge/aa-project/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/aa-project/$name-$version.tar.gz)
 
 build () {
 	cd $name-1.4.0
diff --git a/abe/Pkgfile b/abe/Pkgfile
index b8f81802c..6358fb727 100644
--- a/abe/Pkgfile
+++ b/abe/Pkgfile
@@ -7,7 +7,7 @@
 name=abe
 version=1.1
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/abe/abe-$version.tar.gz)
+source=(http://download.sourceforge.net/abe/abe-$version.tar.gz)
 
 build() {
    cd abe-$version
diff --git a/acpid/Pkgfile b/acpid/Pkgfile
index a21816188..45d143aeb 100644
--- a/acpid/Pkgfile
+++ b/acpid/Pkgfile
@@ -6,7 +6,7 @@
 name=acpid
 version=1.0.10
 release=1
-source=(http://dl.sourceforge.net/acpid/acpid-$version.tar.gz \
+source=(http://download.sourceforge.net/acpid/acpid-$version.tar.gz \
 		acpid.rc default default.sh)
 
 build() {
diff --git a/allegro/Pkgfile b/allegro/Pkgfile
index 4568699e8..2c6878f73 100644
--- a/allegro/Pkgfile
+++ b/allegro/Pkgfile
@@ -7,7 +7,7 @@
 name=allegro
 version=4.4.1.1
 release=1
-source=(http://downloads.sourceforge.net/project/alleg/$name/$version/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/alleg/$name/$version/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/amsn/Pkgfile b/amsn/Pkgfile
index 199c11b09..4e260cad6 100644
--- a/amsn/Pkgfile
+++ b/amsn/Pkgfile
@@ -7,7 +7,7 @@
 name=amsn
 version=0.98.3
 release=1
-source=(http://dl.sourceforge.net/project/$name/$name/$version/$name-$version-src.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name/$version/$name-$version-src.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/aqsis/Pkgfile b/aqsis/Pkgfile
index 972654f26..91992e9a9 100644
--- a/aqsis/Pkgfile
+++ b/aqsis/Pkgfile
@@ -7,7 +7,7 @@
 name=aqsis
 version=1.2.0
 release=2
-source=(http://dl.sourceforge.net/sourceforge/${name}/${name}-${version}.tar.gz)
+source=(http://download.sourceforge.net/${name}/${name}-${version}.tar.gz)
 
 build() {
 	cd ${name}-${version}
diff --git a/arpon/Pkgfile b/arpon/Pkgfile
index 7c9f30e4e..361a33408 100644
--- a/arpon/Pkgfile
+++ b/arpon/Pkgfile
@@ -6,7 +6,7 @@
 name=arpon
 version=1.90
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/ArpON-$version.tar.gz \
+source=(http://download.sourceforge.net/$name/ArpON-$version.tar.gz \
         arpon)
 
 build() {
diff --git a/atanks/Pkgfile b/atanks/Pkgfile
index 44d530dbb..0c8149c19 100644
--- a/atanks/Pkgfile
+++ b/atanks/Pkgfile
@@ -7,7 +7,7 @@
 name=atanks
 version=4.7
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	$name-4.7-install.patch)
 
 build() {
diff --git a/avifile/Pkgfile b/avifile/Pkgfile
index 091b924e3..bfc393904 100644
--- a/avifile/Pkgfile
+++ b/avifile/Pkgfile
@@ -7,7 +7,7 @@
 name=avifile
 version=0.7-0.7.45
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/avifile/avifile-$version.tar.bz2
+source=(http://download.sourceforge.net/avifile/avifile-$version.tar.bz2
 	avifile-$version-gcc4.patch)
 
 build() {
diff --git a/baras/Pkgfile b/baras/Pkgfile
index be55dc465..1794dcffb 100644
--- a/baras/Pkgfile
+++ b/baras/Pkgfile
@@ -8,7 +8,7 @@
 name=baras
 version=099c
 release=1
-source=(http://dl.sourceforge.net/baras/$name-$version.tar.bz2 baras.patch)
+source=(http://download.sourceforge.net/baras/$name-$version.tar.bz2 baras.patch)
 
 build() {
     cd $name
diff --git a/bftpd/Pkgfile b/bftpd/Pkgfile
index 0bd000a00..d2c3734ae 100644
--- a/bftpd/Pkgfile
+++ b/bftpd/Pkgfile
@@ -6,7 +6,7 @@
 name=bftpd
 version=3.1
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	ftpd)
 
 build () {
diff --git a/bmp/Pkgfile b/bmp/Pkgfile
index 8d29a6ba4..538c58d50 100644
--- a/bmp/Pkgfile
+++ b/bmp/Pkgfile
@@ -7,7 +7,7 @@
 name=bmp
 version=0.9.7.1
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/beepmp/$name-$version.tar.gz
+source=(http://download.sourceforge.net/beepmp/$name-$version.tar.gz
 	beep-config)
 
 build() {
diff --git a/bomberclone/Pkgfile b/bomberclone/Pkgfile
index 0acd8fd24..7cc0377b7 100644
--- a/bomberclone/Pkgfile
+++ b/bomberclone/Pkgfile
@@ -7,7 +7,7 @@
 name=bomberclone
 version=0.11.8
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/bomberclone/bomberclone-$version.tar.bz2)
+source=(http://download.sourceforge.net/bomberclone/bomberclone-$version.tar.bz2)
 
 build() {
 	cd bomberclone-$version
diff --git a/boost-jam/Pkgfile b/boost-jam/Pkgfile
index e6f8d973b..202164f57 100644
--- a/boost-jam/Pkgfile
+++ b/boost-jam/Pkgfile
@@ -7,7 +7,7 @@
 name=boost-jam
 version=3.1.17
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/boost/$name-$version.tgz
+source=(http://download.sourceforge.net/boost/$name-$version.tgz
 	$name-3.1.17-misc.patch
 	$name-3.1.17-cflags.patch)
 
diff --git a/boost/Pkgfile b/boost/Pkgfile
index aa8713995..2275578e1 100644
--- a/boost/Pkgfile
+++ b/boost/Pkgfile
@@ -7,7 +7,7 @@
 name=boost
 version=1.44.0
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/boost/boost_${version//./_}.tar.bz2)
+source=(http://download.sourceforge.net/boost/boost_${version//./_}.tar.bz2)
 
 build() {
 	cd boost_${version//./_}
diff --git a/bridge-utils/Pkgfile b/bridge-utils/Pkgfile
index eab2e205b..c6115e0f7 100644
--- a/bridge-utils/Pkgfile
+++ b/bridge-utils/Pkgfile
@@ -5,7 +5,7 @@
 name=bridge-utils
 version=1.4
 release=1
-source=(http://downloads.sourceforge.net/bridge/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/bridge/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/cdrdao/Pkgfile b/cdrdao/Pkgfile
index a074e0e65..38b7973b8 100644
--- a/cdrdao/Pkgfile
+++ b/cdrdao/Pkgfile
@@ -7,7 +7,7 @@
 name=cdrdao
 version=1.2.3
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/clamav/Pkgfile b/clamav/Pkgfile
index 9a36b5f40..2f7faed14 100644
--- a/clamav/Pkgfile
+++ b/clamav/Pkgfile
@@ -6,7 +6,7 @@
 name=clamav
 version=0.96.3
 release=1
-source=(http://downloads.sourceforge.net/$name/$name-$version.tar.gz \
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz \
 	clamd.conf freshclam.conf clamd freshclam)
 
 build() {
diff --git a/claws-mail/Pkgfile b/claws-mail/Pkgfile
index 1a5ab4d80..1b9a98f3f 100644
--- a/claws-mail/Pkgfile
+++ b/claws-mail/Pkgfile
@@ -9,7 +9,7 @@
 name=claws-mail
 version=3.7.4
 release=1
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/Claws%20Mail/$version/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/sylpheed-claws/Claws%20Mail/$version/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/cramfs-tools/Pkgfile b/cramfs-tools/Pkgfile
index d2416084a..9d7402839 100644
--- a/cramfs-tools/Pkgfile
+++ b/cramfs-tools/Pkgfile
@@ -6,7 +6,7 @@
 name=cramfs-tools
 version=1.1
 release=1
-source=(http://optusnet.dl.sourceforge.net/sourceforge/cramfs/cramfs-$version.tar.gz)
+source=(http://optusnet.download.sourceforge.net/cramfs/cramfs-$version.tar.gz)
 
 build() {
     cd cramfs-$version
diff --git a/cryptcat/Pkgfile b/cryptcat/Pkgfile
index afecd9014..e1cc55f2e 100644
--- a/cryptcat/Pkgfile
+++ b/cryptcat/Pkgfile
@@ -6,7 +6,7 @@
 name=cryptcat
 version=1.2.1
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-unix-$version.tar \
+source=(http://download.sourceforge.net/$name/$name-unix-$version.tar \
 	      netcat.patch)
 
 build() {
diff --git a/ddclient/Pkgfile b/ddclient/Pkgfile
index b6f4b63e6..579c16441 100644
--- a/ddclient/Pkgfile
+++ b/ddclient/Pkgfile
@@ -7,7 +7,7 @@
 name=ddclient
 version=3.8.0
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/ddclient/ddclient-$version.tar.bz2
+source=(http://download.sourceforge.net/ddclient/ddclient-$version.tar.bz2
 	ddclient.rc)
 
 build() {
diff --git a/denyhosts/Pkgfile b/denyhosts/Pkgfile
index 2a5421995..6c628f952 100644
--- a/denyhosts/Pkgfile
+++ b/denyhosts/Pkgfile
@@ -7,7 +7,7 @@
 name=denyhosts
 version=2.6
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/denyhosts/DenyHosts-$version.tar.gz \
+source=(http://download.sourceforge.net/denyhosts/DenyHosts-$version.tar.gz \
 	denyhosts-$version-config.patch)
 
 build() {
diff --git a/djview4/Pkgfile b/djview4/Pkgfile
index 550dfd612..82e988b9c 100644
--- a/djview4/Pkgfile
+++ b/djview4/Pkgfile
@@ -6,7 +6,7 @@
 name=djview4
 version=4.5
 release=1
-source=(http://dl.sourceforge.net/sourceforge/djvu/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/djvu/$name-$version.tar.gz)
 
 build() {
 	cd $name-*
diff --git a/djvulibre/Pkgfile b/djvulibre/Pkgfile
index 941143de0..8ee1543e6 100644
--- a/djvulibre/Pkgfile
+++ b/djvulibre/Pkgfile
@@ -7,7 +7,7 @@
 name=djvulibre
 version=3.5.22
 release=1
-source=(http://dl.sourceforge.net/sourceforge/djvu/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/djvu/$name-$version.tar.gz)
 
 build() {
 	cd $name-*
diff --git a/docutils/Pkgfile b/docutils/Pkgfile
index 0e41f1a67..cb2a12e5c 100644
--- a/docutils/Pkgfile
+++ b/docutils/Pkgfile
@@ -7,7 +7,7 @@
 name=docutils
 version=0.7
 release=1
-source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
    cd $name-$version
diff --git a/dvdauthor/Pkgfile b/dvdauthor/Pkgfile
index 6d81fd4cd..778c96e87 100644
--- a/dvdauthor/Pkgfile
+++ b/dvdauthor/Pkgfile
@@ -7,7 +7,7 @@
 name=dvdauthor
 version=0.6.18
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/dvdauthor/dvdauthor-$version.tar.gz)
+source=(http://download.sourceforge.net/dvdauthor/dvdauthor-$version.tar.gz)
 
 build() {
 	cd dvdauthor
diff --git a/ebtables/Pkgfile b/ebtables/Pkgfile
index effac0e1d..b0b42de98 100644
--- a/ebtables/Pkgfile
+++ b/ebtables/Pkgfile
@@ -6,7 +6,7 @@
 name=ebtables
 version=2.0.9-1
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-v$version.tar.gz \
+source=(http://download.sourceforge.net/$name/$name-v$version.tar.gz \
 		$name-makefile.diff)
 
 build() {
diff --git a/em8300/Pkgfile b/em8300/Pkgfile
index 9046d2951..1fdb9f788 100644
--- a/em8300/Pkgfile
+++ b/em8300/Pkgfile
@@ -6,7 +6,7 @@
 name=em8300
 version=0.15.4cvs2
 release=2
-source=(http://dl.sourceforge.net/sourceforge/dxr3/$name-0.15.3.tar.gz em8300_kernel_2.6.17_2.patch.gz em8300_zoom.patch.gz em8300_ntsc_pos.patch.gz em8300_ntsc_default.patch.gz)
+source=(http://download.sourceforge.net/dxr3/$name-0.15.3.tar.gz em8300_kernel_2.6.17_2.patch.gz em8300_zoom.patch.gz em8300_ntsc_pos.patch.gz em8300_ntsc_default.patch.gz)
 
 build () {
 	cd $name-0.15.3
diff --git a/ethtool/Pkgfile b/ethtool/Pkgfile
index d4ae6fa76..c4367491e 100644
--- a/ethtool/Pkgfile
+++ b/ethtool/Pkgfile
@@ -7,7 +7,7 @@
 name=ethtool
 version=2.6.33
 release=1
-source=(http://dl.sourceforge.net/sourceforge/gkernel/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/gkernel/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/extremetuxracer/Pkgfile b/extremetuxracer/Pkgfile
index 4de34116e..b95c9241d 100644
--- a/extremetuxracer/Pkgfile
+++ b/extremetuxracer/Pkgfile
@@ -7,7 +7,7 @@
 name=extremetuxracer
 version=0.5beta
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
 	cd extreme-tuxracer-$version
diff --git a/faac/Pkgfile b/faac/Pkgfile
index 7b3998a13..3a0ade9eb 100644
--- a/faac/Pkgfile
+++ b/faac/Pkgfile
@@ -6,7 +6,7 @@
 name=faac
 version=1.28
 release=2
-source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2 \
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2 \
 	$name-$version-external-libmp4v2.patch)
 
 build () {
diff --git a/faad2/Pkgfile b/faad2/Pkgfile
index de89575ca..90503f4f5 100644
--- a/faad2/Pkgfile
+++ b/faad2/Pkgfile
@@ -6,7 +6,7 @@
 name=faad2
 version=2.7
 release=1
-source=(http://downloads.sourceforge.net/faac/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/faac/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/feedparser/Pkgfile b/feedparser/Pkgfile
index 44ea7e177..c0edd1198 100644
--- a/feedparser/Pkgfile
+++ b/feedparser/Pkgfile
@@ -7,7 +7,7 @@
 name=feedparser
 version=4.1
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.zip)
+source=(http://download.sourceforge.net/$name/$name-$version.zip)
 
 build() {
   python setup.py install --root=$PKG
diff --git a/ffe/Pkgfile b/ffe/Pkgfile
index 6585d0678..12d7850b9 100644
--- a/ffe/Pkgfile
+++ b/ffe/Pkgfile
@@ -6,7 +6,7 @@
 name=ffe
 version=0.2.8
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/ff-extractor/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/ff-extractor/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/fluxbox/Pkgfile b/fluxbox/Pkgfile
index db4b9e3c5..22125f80c 100644
--- a/fluxbox/Pkgfile
+++ b/fluxbox/Pkgfile
@@ -6,7 +6,7 @@
 name=fluxbox
 version=1.1.1
 release=1
-source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
    cd $name-$version
diff --git a/freeciv/Pkgfile b/freeciv/Pkgfile
index 8b7076fb9..0e41211de 100644
--- a/freeciv/Pkgfile
+++ b/freeciv/Pkgfile
@@ -7,7 +7,7 @@
 name=freeciv
 version=2.2.3
 release=1
-source=(http://dfn.dl.sourceforge.net/sourceforge/freeciv/$name-$version.tar.bz2)
+source=(http://dfn.download.sourceforge.net/freeciv/$name-$version.tar.bz2)
 
 build() {
    cd $name-$version
diff --git a/fsam7440-console/Pkgfile b/fsam7440-console/Pkgfile
index 85af249b7..da9e1d5aa 100644
--- a/fsam7440-console/Pkgfile
+++ b/fsam7440-console/Pkgfile
@@ -6,7 +6,7 @@
 name=fsam7440-console
 version=0.2
 release=2
-source=(http://dl.sourceforge.net/sourceforge/fsam7440/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/fsam7440/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/ftgl/Pkgfile b/ftgl/Pkgfile
index 57d9ba3ff..b36462385 100644
--- a/ftgl/Pkgfile
+++ b/ftgl/Pkgfile
@@ -7,7 +7,7 @@
 name=ftgl
 version=2.1.3-rc5
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
   cd $name-2.1.3~rc5
diff --git a/fuse-python/Pkgfile b/fuse-python/Pkgfile
index 193316ac1..7202b9c15 100644
--- a/fuse-python/Pkgfile
+++ b/fuse-python/Pkgfile
@@ -7,7 +7,7 @@
 name=fuse-python
 version=0.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/fuse/fuse-python-$version.tar.gz)
+source=(http://download.sourceforge.net/fuse/fuse-python-$version.tar.gz)
 
 build() {
 	cd fuse-python-$version
diff --git a/gcolor2/Pkgfile b/gcolor2/Pkgfile
index fbff07727..905c2e764 100644
--- a/gcolor2/Pkgfile
+++ b/gcolor2/Pkgfile
@@ -7,7 +7,7 @@
 name=gcolor2
 version=0.4
 release=3
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/gdc/Pkgfile b/gdc/Pkgfile
index 7cd0ee4e8..d68048e02 100644
--- a/gdc/Pkgfile
+++ b/gdc/Pkgfile
@@ -9,7 +9,7 @@ name=gdc
 version=0.24
 gcc_version=4.1.2
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/dgcc/gdc-$version-src.tar.bz2 \
+source=(http://download.sourceforge.net/dgcc/gdc-$version-src.tar.bz2 \
 	ftp://ftp.gnu.org/pub/gnu/gcc/gcc-$gcc_version/gcc-{core,g++}-$gcc_version.tar.bz2 \
 	gdc-$gcc_version-nocheck-fixincludes.patch \
 	gdc-$gcc_version-fixinc.patch)
diff --git a/gift-gnutella/Pkgfile b/gift-gnutella/Pkgfile
index 4f13339a2..afa98187e 100644
--- a/gift-gnutella/Pkgfile
+++ b/gift-gnutella/Pkgfile
@@ -7,7 +7,7 @@
 name=gift-gnutella
 version=0.0.11
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/gift/gift-gnutella-$version.tar.bz2
+source=(http://download.sourceforge.net/gift/gift-gnutella-$version.tar.bz2
 	http://update.kceasy.com/update/gnutella/nodes.gzip
 	http://update.kceasy.com/update/gnutella/hostiles.txt.gzip
 	http://update.kceasy.com/update/gnutella/gwebcaches.gzip)
diff --git a/gift-openft/Pkgfile b/gift-openft/Pkgfile
index f611eb5f9..164963b4f 100644
--- a/gift-openft/Pkgfile
+++ b/gift-openft/Pkgfile
@@ -7,7 +7,7 @@
 name=gift-openft
 version=0.2.1.6
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/gift/gift-openft-$version.tar.bz2
+source=(http://download.sourceforge.net/gift/gift-openft-$version.tar.bz2
 	http://update.kceasy.com/update/openft/nodes.gzip)
 
 build() {
diff --git a/gift/Pkgfile b/gift/Pkgfile
index 1c993aa98..b87ac0454 100644
--- a/gift/Pkgfile
+++ b/gift/Pkgfile
@@ -6,7 +6,7 @@
 name=gift
 version=0.11.8.1
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/gift/gift-$version.tar.bz2)
+source=(http://download.sourceforge.net/gift/gift-$version.tar.bz2)
 
 build() {
 	cd gift-$version
diff --git a/giftoxic/Pkgfile b/giftoxic/Pkgfile
index b1049c2c6..d37ba5913 100644
--- a/giftoxic/Pkgfile
+++ b/giftoxic/Pkgfile
@@ -7,7 +7,7 @@
 name=giftoxic
 version=0.0.10
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/giftoxic/giFToxic-$version.tar.gz)
+source=(http://download.sourceforge.net/giftoxic/giFToxic-$version.tar.gz)
 
 build() {
 	cd giFToxic-$version
diff --git a/gtk-recordmydesktop/Pkgfile b/gtk-recordmydesktop/Pkgfile
index 96265f7ff..5476bd522 100644
--- a/gtk-recordmydesktop/Pkgfile
+++ b/gtk-recordmydesktop/Pkgfile
@@ -7,7 +7,7 @@
 name=gtk-recordmydesktop
 version=0.3.8
 release=1
-source=(http://dl.sourceforge.net/sourceforge/recordmydesktop/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/recordmydesktop/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/heme/Pkgfile b/heme/Pkgfile
index dbebb2df8..1f6bae47a 100644
--- a/heme/Pkgfile
+++ b/heme/Pkgfile
@@ -6,7 +6,7 @@
 name=heme
 version=0.4.2
 release=1
-source=(http://dl.sourceforge.net/sourceforge/heme/$name-$version.tar.gz\
+source=(http://download.sourceforge.net/heme/$name-$version.tar.gz\
 		$name-$version-Makefile.diff)
 
 build() {
diff --git a/id3lib/Pkgfile b/id3lib/Pkgfile
index ab2d69879..6bed5faf2 100644
--- a/id3lib/Pkgfile
+++ b/id3lib/Pkgfile
@@ -7,7 +7,7 @@
 name=id3lib
 version=3.8.3
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	$name-3.8.3-zlib.patch
 	$name-3.8.3-test_io.patch
 	$name-3.8.3-autoconf259.patch
diff --git a/inadyn-mt/Pkgfile b/inadyn-mt/Pkgfile
index afa60ed5a..ea5bb8a89 100644
--- a/inadyn-mt/Pkgfile
+++ b/inadyn-mt/Pkgfile
@@ -7,7 +7,7 @@
 name=inadyn-mt
 version=02.20.20
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name.v.$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name.v.$version.tar.gz)
 
 build() {
   cd $name.v.$version
diff --git a/ipmitool/Pkgfile b/ipmitool/Pkgfile
index f134a493d..e2f73779b 100644
--- a/ipmitool/Pkgfile
+++ b/ipmitool/Pkgfile
@@ -7,7 +7,7 @@
 name=ipmitool
 version=1.8.11
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/ipsec-tools/Pkgfile b/ipsec-tools/Pkgfile
index 6038e1b8a..a58ca9116 100644
--- a/ipsec-tools/Pkgfile
+++ b/ipsec-tools/Pkgfile
@@ -6,7 +6,7 @@
 name=ipsec-tools
 version=0.7.2
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/jamvm/Pkgfile b/jamvm/Pkgfile
index 493242758..011a2b3b4 100644
--- a/jamvm/Pkgfile
+++ b/jamvm/Pkgfile
@@ -7,7 +7,7 @@
 name=jamvm
 version=1.5.3
 release=1
-source=(http://dl.sourceforge.net/project/$name/$name/JamVM%20$version/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name/JamVM%20$version/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/jedit/Pkgfile b/jedit/Pkgfile
index 1c62d24b4..6515a1ff8 100644
--- a/jedit/Pkgfile
+++ b/jedit/Pkgfile
@@ -7,7 +7,7 @@
 name=jedit
 version=4.3.1
 release=1
-source=(http://dl.sourceforge.net/project/jedit/jedit/$version/jedit${version}install.jar)
+source=(http://download.sourceforge.net/jedit/jedit/$version/jedit${version}install.jar)
 
 build() {
 	mkdir -p $PKG/usr/lib/jedit
diff --git a/kvm/Pkgfile b/kvm/Pkgfile
index 6c0144a55..2e6d60bb2 100644
--- a/kvm/Pkgfile
+++ b/kvm/Pkgfile
@@ -6,7 +6,7 @@
 name=kvm
 version=88
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 p1.diff p2.diff)
 
 build () {
diff --git a/libcddb/Pkgfile b/libcddb/Pkgfile
index 9e17e2651..b7fd0e9f7 100644
--- a/libcddb/Pkgfile
+++ b/libcddb/Pkgfile
@@ -7,7 +7,7 @@
 name=libcddb
 version=1.3.2
 release=1
-source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/libcgi/Pkgfile b/libcgi/Pkgfile
index 4cb7d05f8..f417027de 100644
--- a/libcgi/Pkgfile
+++ b/libcgi/Pkgfile
@@ -7,7 +7,7 @@
 name=libcgi
 version=1.0
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/libcgi/libcgi-$version.tar.gz)
+source=(http://download.sourceforge.net/libcgi/libcgi-$version.tar.gz)
 
 build() {
 	cd libcgi-$version
diff --git a/libdnet/Pkgfile b/libdnet/Pkgfile
index a3d16b5c4..bdf24e87b 100644
--- a/libdnet/Pkgfile
+++ b/libdnet/Pkgfile
@@ -6,7 +6,7 @@
 name=libdnet
 version=1.11
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
     cd  $name-$version
diff --git a/libdv/Pkgfile b/libdv/Pkgfile
index b8c371665..1149886ef 100644
--- a/libdv/Pkgfile
+++ b/libdv/Pkgfile
@@ -7,7 +7,7 @@
 name=libdv
 version=1.0.0
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	http://www.hvlinux.net/crux/distfiles/$name/$name-1.0.0-pic.patch.bz2
 	$name-0.99-2.6.patch)
 
diff --git a/libetpan/Pkgfile b/libetpan/Pkgfile
index 4bb98dd64..f38fb1dbd 100644
--- a/libetpan/Pkgfile
+++ b/libetpan/Pkgfile
@@ -9,7 +9,7 @@
 name=libetpan
 version=0.58
 release=1
-source=(http://dl.sourceforge.net/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/libfame/Pkgfile b/libfame/Pkgfile
index 51b9e6b42..d27b813fa 100644
--- a/libfame/Pkgfile
+++ b/libfame/Pkgfile
@@ -7,7 +7,7 @@
 name=libfame
 version=0.9.1
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/fame/libfame-$version.tar.gz
+source=(http://download.sourceforge.net/fame/libfame-$version.tar.gz
 	$name-$version-m4.patch
 	$name-$version-gcc-version-check.patch
 	$name-$version-mmx.patch
diff --git a/libmcrypt/Pkgfile b/libmcrypt/Pkgfile
index c866f4300..04056ee06 100644
--- a/libmcrypt/Pkgfile
+++ b/libmcrypt/Pkgfile
@@ -7,7 +7,7 @@
 name=libmcrypt
 version=2.5.8
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/mcrypt/libmcrypt-$version.tar.gz)
+source=(http://download.sourceforge.net/mcrypt/libmcrypt-$version.tar.gz)
 
 build() {
 	cd libmcrypt-$version
diff --git a/libmodplug/Pkgfile b/libmodplug/Pkgfile
index c03fd99ae..c46f28ee2 100644
--- a/libmodplug/Pkgfile
+++ b/libmodplug/Pkgfile
@@ -7,7 +7,7 @@
 name=libmodplug
 version=0.8.7
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/modplug-xmms/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/modplug-xmms/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/libmpdclient/Pkgfile b/libmpdclient/Pkgfile
index 23406adf0..b9e9f36ab 100644
--- a/libmpdclient/Pkgfile
+++ b/libmpdclient/Pkgfile
@@ -5,7 +5,7 @@
 name=libmpdclient
 version=2.3
 release=1
-source=(http://downloads.sourceforge.net/project/musicpd/$name/$version/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/musicpd/$name/$version/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/libnids/Pkgfile b/libnids/Pkgfile
index 9fa796477..bae818b7d 100644
--- a/libnids/Pkgfile
+++ b/libnids/Pkgfile
@@ -6,7 +6,7 @@
 name=libnids
 version=1.24
 release=1
-source=(http://dl.sourceforge.net/sourceforge/libnids/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/libnids/$name-$version.tar.gz)
 
 build() {
     cd  $name-$version
diff --git a/libquicktime/Pkgfile b/libquicktime/Pkgfile
index 6909cb4d6..5ed80dbbe 100644
--- a/libquicktime/Pkgfile
+++ b/libquicktime/Pkgfile
@@ -7,7 +7,7 @@
 name=libquicktime
 version=1.1.3
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	$name-1.1.3_x264-abi.patch)
 
 build() {
diff --git a/libvisual/Pkgfile b/libvisual/Pkgfile
index fb5054d5d..75b28eb37 100644
--- a/libvisual/Pkgfile
+++ b/libvisual/Pkgfile
@@ -7,7 +7,7 @@
 name=libvisual
 version=0.4.0
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/libvisual/libvisual-$version.tar.bz2)
+source=(http://download.sourceforge.net/libvisual/libvisual-$version.tar.bz2)
 
 build() {
 	cd libvisual-$version
diff --git a/licq/Pkgfile b/licq/Pkgfile
index 4201a3c45..1fe4c9632 100644
--- a/licq/Pkgfile
+++ b/licq/Pkgfile
@@ -7,7 +7,7 @@
 name=licq
 version=1.3.6
 release=2
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build () {
 	cd $name-$version
diff --git a/lirc/Pkgfile b/lirc/Pkgfile
index c6405fa42..382b499ef 100644
--- a/lirc/Pkgfile
+++ b/lirc/Pkgfile
@@ -7,7 +7,7 @@
 name=lirc
 version=0.8.4a
 release=1
-source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2 irxevent_name.diff lircd)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2 irxevent_name.diff lircd)
 
 # Possible drivers:	
 #
diff --git a/lmms/Pkgfile b/lmms/Pkgfile
index 829569581..21b182429 100644
--- a/lmms/Pkgfile
+++ b/lmms/Pkgfile
@@ -8,7 +8,7 @@
 name=lmms
 version=0.4.7
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
   export QTDIR=/usr/share/qt4
diff --git a/menumaker/Pkgfile b/menumaker/Pkgfile
index fbecc5987..97dd25309 100644
--- a/menumaker/Pkgfile
+++ b/menumaker/Pkgfile
@@ -7,7 +7,7 @@
 name=menumaker
 version=0.99.7
 release=1
-source=(http://dl.sourceforge.net/sourceforge/menumaker/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/menumaker/$name-$version.tar.gz)
 
 build() {
    cd $name-$version
diff --git a/miau/Pkgfile b/miau/Pkgfile
index 9f91190a4..03792ebde 100644
--- a/miau/Pkgfile
+++ b/miau/Pkgfile
@@ -7,7 +7,7 @@
 name=miau
 version=0.6.5
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/miau/miau-$version.tar.bz2)
+source=(http://download.sourceforge.net/miau/miau-$version.tar.bz2)
 
 build() {
 	cd miau-$version
diff --git a/mjpegtools/Pkgfile b/mjpegtools/Pkgfile
index 98d9b141c..1429cc0ea 100644
--- a/mjpegtools/Pkgfile
+++ b/mjpegtools/Pkgfile
@@ -7,7 +7,7 @@
 name=mjpegtools
 version=1.9.0
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/mjpeg/$name-$version.tar.gz
+source=(http://download.sourceforge.net/mjpeg/$name-$version.tar.gz
 	mjpegtools-1.9.0-glibc-2.10.patch)
 
 build() {
diff --git a/mldonkey/Pkgfile b/mldonkey/Pkgfile
index 593259158..f17ad5576 100644
--- a/mldonkey/Pkgfile
+++ b/mldonkey/Pkgfile
@@ -8,7 +8,7 @@
 name=mldonkey
 version=3.0.5
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2 \
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2 \
         mlnetd)
 
 build() {
diff --git a/mpc/Pkgfile b/mpc/Pkgfile
index 6000323d3..61c8babac 100644
--- a/mpc/Pkgfile
+++ b/mpc/Pkgfile
@@ -7,7 +7,7 @@
 name=mpc
 version=0.19
 release=1
-source=(http://downloads.sourceforge.net/project/musicpd/mpc/$version/mpc-$version.tar.bz2)
+source=(http://download.sourceforge.net/musicpd/mpc/$version/mpc-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/mpd/Pkgfile b/mpd/Pkgfile
index 85946419a..27b575cc2 100644
--- a/mpd/Pkgfile
+++ b/mpd/Pkgfile
@@ -8,7 +8,7 @@
 name=mpd
 version=0.15.13
 release=1
-source=(http://dl.sourceforge.net/musicpd/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/musicpd/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/mrxvt/Pkgfile b/mrxvt/Pkgfile
index 283df9883..1168b16c1 100644
--- a/mrxvt/Pkgfile
+++ b/mrxvt/Pkgfile
@@ -7,7 +7,7 @@
 name=mrxvt
 version=0.5.4
 release=2
-source=(http://dl.sourceforge.net/sourceforge/materm/$name-$version.tar.gz \
+source=(http://download.sourceforge.net/materm/$name-$version.tar.gz \
         $name-$version-001-fix-segfault-when-wd-empty.patch)
 
 build() {
diff --git a/muttprint/Pkgfile b/muttprint/Pkgfile
index edf158f3f..3010fee3f 100644
--- a/muttprint/Pkgfile
+++ b/muttprint/Pkgfile
@@ -7,7 +7,7 @@
 name=muttprint
 version=0.72d
 release=1
-source=(http://dl.sourceforge.net/${name}/${name}-${version}.tar.gz)
+source=(http://download.sourceforge.net/${name}/${name}-${version}.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/ncmpc/Pkgfile b/ncmpc/Pkgfile
index 24e72a8ab..9e2a2fbb0 100644
--- a/ncmpc/Pkgfile
+++ b/ncmpc/Pkgfile
@@ -7,7 +7,7 @@
 name=ncmpc
 version=0.18
 release=1
-source=(http://downloads.sourceforge.net/musicpd/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/musicpd/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/ndiswrapper/Pkgfile b/ndiswrapper/Pkgfile
index 04b774e2a..da9798654 100644
--- a/ndiswrapper/Pkgfile
+++ b/ndiswrapper/Pkgfile
@@ -6,7 +6,7 @@
 name=ndiswrapper
 version=1.53
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	ndiswrapper-1.53-linux_2.6.27.patch)
 
 build() {
diff --git a/net-snmp/Pkgfile b/net-snmp/Pkgfile
index 91aaa14ce..f898ce4ea 100644
--- a/net-snmp/Pkgfile
+++ b/net-snmp/Pkgfile
@@ -7,7 +7,7 @@
 name=net-snmp
 version=5.4.3
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz \
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz \
 		snmpd snmpd.conf net-snmp-5.4.1-sensors3.patch)
 
 build() {
diff --git a/nmon/Pkgfile b/nmon/Pkgfile
index 15f4049ae..e72079e0e 100644
--- a/nmon/Pkgfile
+++ b/nmon/Pkgfile
@@ -6,7 +6,7 @@
 name=nmon
 version=14a
 release=1
-source=(http://dl.sourceforge.net/nmon/lmon${version}.c)
+source=(http://download.sourceforge.net/nmon/lmon${version}.c)
 
 build() {
   install -d -m 755 $PKG/usr/bin
diff --git a/numarray/Pkgfile b/numarray/Pkgfile
index 065bef088..8fbfba8e0 100644
--- a/numarray/Pkgfile
+++ b/numarray/Pkgfile
@@ -7,7 +7,7 @@
 name=numarray
 version=1.5.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/numpy/numarray-$version.tar.gz)
+source=(http://download.sourceforge.net/numpy/numarray-$version.tar.gz)
 
 build() {
 	cd numarray-$version
diff --git a/numeric/Pkgfile b/numeric/Pkgfile
index 9cfc06658..d03119b94 100644
--- a/numeric/Pkgfile
+++ b/numeric/Pkgfile
@@ -7,7 +7,7 @@
 name=numeric
 version=24.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/numpy/Numeric-$version.tar.gz)
+source=(http://download.sourceforge.net/numpy/Numeric-$version.tar.gz)
 
 build() {
 	cd Numeric-$version
diff --git a/ode/Pkgfile b/ode/Pkgfile
index d69f06fc9..10c1f0061 100644
--- a/ode/Pkgfile
+++ b/ode/Pkgfile
@@ -7,7 +7,7 @@
 name=ode
 version=0.11.1
 release=1
-source=(http://dl.sourceforge.net/sourceforge/opende/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/opende/$name-$version.tar.bz2)
 
 build() {
   cd $name-$version
diff --git a/opencore-amr/Pkgfile b/opencore-amr/Pkgfile
index 0c0c98bf9..2cecf92d7 100644
--- a/opencore-amr/Pkgfile
+++ b/opencore-amr/Pkgfile
@@ -6,7 +6,7 @@
 name=opencore-amr
 version=0.1.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/openmortal/Pkgfile b/openmortal/Pkgfile
index 556f85b9f..3ca4167a0 100644
--- a/openmortal/Pkgfile
+++ b/openmortal/Pkgfile
@@ -6,7 +6,7 @@
 name=openmortal
 version=0.7
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/openmortal/$name-$version.tar.bz2 fixcmenu.diff)
+source=(http://download.sourceforge.net/openmortal/$name-$version.tar.bz2 fixcmenu.diff)
 
 build() {
   cd $name-$version
diff --git a/pptp/Pkgfile b/pptp/Pkgfile
index 05b7ad90f..7f304f231 100644
--- a/pptp/Pkgfile
+++ b/pptp/Pkgfile
@@ -7,7 +7,7 @@
 name=pptp
 version=1.7.2
 release=1
-source=(http://dl.sourceforge.net/pptpclient/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/pptpclient/$name-$version.tar.gz)
 
 build() {
    cd ${name}-$version
diff --git a/preload/Pkgfile b/preload/Pkgfile
index ad24879b1..74ddf1c95 100644
--- a/preload/Pkgfile
+++ b/preload/Pkgfile
@@ -7,7 +7,7 @@
 name=preload
 version=0.6.4
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	rc.preload
 	$name-0.6.3-memcached-default.patch
 	$name-0.6.3-statedir-fix.patch
diff --git a/psi-im/Pkgfile b/psi-im/Pkgfile
index cbea5e34d..c8f0ac09e 100644
--- a/psi-im/Pkgfile
+++ b/psi-im/Pkgfile
@@ -7,7 +7,7 @@
 name=psi-im
 version=0.14
 release=1
-source=(http://dl.sourceforge.net/sourceforge/psi/psi-$version.tar.bz2)
+source=(http://download.sourceforge.net/psi/psi-$version.tar.bz2)
 
 build() {
   cd psi-$version
diff --git a/psyco/Pkgfile b/psyco/Pkgfile
index 58316a6b8..2130e42b8 100644
--- a/psyco/Pkgfile
+++ b/psyco/Pkgfile
@@ -8,7 +8,7 @@
 name=psyco
 version=1.6
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version-src.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version-src.tar.gz)
 
 build () {
    cd $name-$version
diff --git a/pwgen/Pkgfile b/pwgen/Pkgfile
index ba33e807b..59bc6fa96 100644
--- a/pwgen/Pkgfile
+++ b/pwgen/Pkgfile
@@ -5,7 +5,7 @@
 name=pwgen
 version=2.06
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build()
 {
diff --git a/pyopengl/Pkgfile b/pyopengl/Pkgfile
index 53adea403..873a6726c 100644
--- a/pyopengl/Pkgfile
+++ b/pyopengl/Pkgfile
@@ -7,7 +7,7 @@
 name=pyopengl
 version=3.0.1a3
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/PyOpenGL-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/PyOpenGL-$version.tar.gz)
 
 build() {
 	cd PyOpenGL-$version
diff --git a/pyopenssl/Pkgfile b/pyopenssl/Pkgfile
index a84193a3e..d2e7173e1 100644
--- a/pyopenssl/Pkgfile
+++ b/pyopenssl/Pkgfile
@@ -8,7 +8,7 @@
 name=pyopenssl
 version=0.9
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/pyOpenSSL-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/pyOpenSSL-$version.tar.gz)
 
 build () {
    cd pyOpenSSL-$version
diff --git a/pyserial/Pkgfile b/pyserial/Pkgfile
index 364069682..85789db55 100644
--- a/pyserial/Pkgfile
+++ b/pyserial/Pkgfile
@@ -7,7 +7,7 @@
 name=pyserial
 version=2.4
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/pyserial/pyserial-$version.tar.gz)
+source=(http://download.sourceforge.net/pyserial/pyserial-$version.tar.gz)
 
 build() {
 	cd pyserial-$version
diff --git a/python-markdown/Pkgfile b/python-markdown/Pkgfile
index 40e756e81..6bc1c830e 100644
--- a/python-markdown/Pkgfile
+++ b/python-markdown/Pkgfile
@@ -6,7 +6,7 @@
 name=python-markdown
 version=1.7
 release=1
-source=(http://dl.sf.net/sourceforge/$name/markdown-$version.tar.gz)
+source=(http://download.sourceforge/$name/markdown-$version.tar.gz)
 
 build() {
 	cd markdown-$version
diff --git a/qemu-kvm/Pkgfile b/qemu-kvm/Pkgfile
index 5982533e9..c040458c3 100644
--- a/qemu-kvm/Pkgfile
+++ b/qemu-kvm/Pkgfile
@@ -6,7 +6,7 @@
 name=qemu-kvm
 version=0.13.0
 release=1
-source=(http://downloads.sourceforge.net/project/kvm/qemu-kvm/$version/qemu-kvm-$version.tar.gz)
+source=(http://download.sourceforge.net/kvm/qemu-kvm/$version/qemu-kvm-$version.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/qingy-themepack/Pkgfile b/qingy-themepack/Pkgfile
index 039c9a938..2e400f42c 100644
--- a/qingy-themepack/Pkgfile
+++ b/qingy-themepack/Pkgfile
@@ -7,7 +7,7 @@
 name=qingy-themepack
 version=1.0
 release=1
-source=(http://dl.sourceforge.net/sourceforge/qingy/qingy_0.3_themepack_$version.tar.bz2)
+source=(http://download.sourceforge.net/qingy/qingy_0.3_themepack_$version.tar.bz2)
 
 build() {
    cd qingy_0.3_themepack_$version
diff --git a/qingy/Pkgfile b/qingy/Pkgfile
index 63d919930..0e6239634 100644
--- a/qingy/Pkgfile
+++ b/qingy/Pkgfile
@@ -7,7 +7,7 @@
 name=qingy
 version=0.9.1
 release=2
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
    cd $name-$version
diff --git a/quesoglc/Pkgfile b/quesoglc/Pkgfile
index 70a9ebd2c..7bc7e5cce 100644
--- a/quesoglc/Pkgfile
+++ b/quesoglc/Pkgfile
@@ -7,7 +7,7 @@
 name=quesoglc
 version=0.7.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/rdesktop/Pkgfile b/rdesktop/Pkgfile
index 83b952ce8..2d134e975 100644
--- a/rdesktop/Pkgfile
+++ b/rdesktop/Pkgfile
@@ -7,7 +7,7 @@
 name=rdesktop
 version=1.6.0
 release=1
-source=(http://dl.sourceforge.net/sourceforge/rdesktop/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/rdesktop/$name-$version.tar.gz)
 build(){
   cd $name-$version
   ./configure --prefix=/usr
diff --git a/recordmydesktop/Pkgfile b/recordmydesktop/Pkgfile
index 62db69188..840835945 100644
--- a/recordmydesktop/Pkgfile
+++ b/recordmydesktop/Pkgfile
@@ -7,7 +7,7 @@
 name=recordmydesktop
 version=0.3.8.1
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/rhapsody/Pkgfile b/rhapsody/Pkgfile
index 2c56950ce..bdb090dde 100644
--- a/rhapsody/Pkgfile
+++ b/rhapsody/Pkgfile
@@ -7,7 +7,7 @@
 name=rhapsody
 version=0.28b
 release=2
-source=(http://dl.sourceforge.net/sourceforge/$name/${name}_$version.tgz)
+source=(http://download.sourceforge.net/$name/${name}_$version.tgz)
 
 build() {
   cd $name-$version
diff --git a/rss-glx/Pkgfile b/rss-glx/Pkgfile
index 562c7ec5f..e04167d97 100644
--- a/rss-glx/Pkgfile
+++ b/rss-glx/Pkgfile
@@ -7,7 +7,7 @@
 name=rss-glx
 version=0.9.1
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/$name/${name}_$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/${name}_$version.tar.bz2)
 
 build() {
 	cd ${name}_$version
diff --git a/scorched3d/Pkgfile b/scorched3d/Pkgfile
index 751e05df4..649d72de2 100644
--- a/scorched3d/Pkgfile
+++ b/scorched3d/Pkgfile
@@ -7,7 +7,7 @@
 name=scorched3d
 version=41.3
 release=1
-source=(http://downloads.sourceforge.net/scorched3d/Scorched3D-$version-src.tar.gz
+source=(http://download.sourceforge.net/scorched3d/Scorched3D-$version-src.tar.gz
 	scorched3d-41.3-gcc43.patch)
 
 build() {
diff --git a/scribus/Pkgfile b/scribus/Pkgfile
index b9f7fa45f..734b2c1e2 100644
--- a/scribus/Pkgfile
+++ b/scribus/Pkgfile
@@ -6,7 +6,7 @@
 name=scribus
 version=1.3.7
 release=1
-source=(http://dl.sourceforge.net/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
    cd $name-$version
diff --git a/sdl_pango/Pkgfile b/sdl_pango/Pkgfile
index 4063f6823..ebdbd2951 100644
--- a/sdl_pango/Pkgfile
+++ b/sdl_pango/Pkgfile
@@ -7,7 +7,7 @@
 name=sdl_pango
 version=0.1.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/sdlpango/SDL_Pango-$version.tar.gz \
+source=(http://download.sourceforge.net/sdlpango/SDL_Pango-$version.tar.gz \
 	http://zarb.org/~gc/t/SDL_Pango-$version-API-adds.patch)
 
 build() {
diff --git a/setserial/Pkgfile b/setserial/Pkgfile
index ff3b1cd03..22581e921 100644
--- a/setserial/Pkgfile
+++ b/setserial/Pkgfile
@@ -6,7 +6,7 @@
 name=setserial
 version=2.17
 release=2
-source=(http://dl.sourceforge.net/sourceforge/setserial/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/setserial/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/sntop/Pkgfile b/sntop/Pkgfile
index 26374088d..ce3491ef0 100644
--- a/sntop/Pkgfile
+++ b/sntop/Pkgfile
@@ -7,7 +7,7 @@
 name=sntop
 version=1.4.3
 release=1
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build () {
    cd $name-$version
diff --git a/sox/Pkgfile b/sox/Pkgfile
index 6817a7bcf..b2217e1cc 100644
--- a/sox/Pkgfile
+++ b/sox/Pkgfile
@@ -7,7 +7,7 @@
 name=sox
 version=14.3.1
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/squashfs-tools/Pkgfile b/squashfs-tools/Pkgfile
index ac30e2ff8..fe206e7f0 100644
--- a/squashfs-tools/Pkgfile
+++ b/squashfs-tools/Pkgfile
@@ -5,7 +5,7 @@
 name=squashfs-tools
 version=4.1
 release=1
-source=(http://downloads.sourceforge.net/squashfs/squashfs${version}.tar.gz)
+source=(http://download.sourceforge.net/squashfs/squashfs${version}.tar.gz)
 
 build() {
 	cd squashfs${version}/$name
diff --git a/streamripper/Pkgfile b/streamripper/Pkgfile
index 857e21597..27fc7fabe 100644
--- a/streamripper/Pkgfile
+++ b/streamripper/Pkgfile
@@ -7,7 +7,7 @@
 name=streamripper
 version=1.64.6
 release=1
-source=(http://prdownloads.sourceforge.net/project/$name/$name%20\(current\)/$version/$name-$version.tar.gz)
+source=(http://prdownload.sourceforge.net/$name/$name%20\(current\)/$version/$name-$version.tar.gz)
 
 build() {
     cd $name-$version
diff --git a/tagtool/Pkgfile b/tagtool/Pkgfile
index ee14076a2..5eaf1be88 100644
--- a/tagtool/Pkgfile
+++ b/tagtool/Pkgfile
@@ -7,7 +7,7 @@
 name=tagtool
 version=0.12.3
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/tcl/Pkgfile b/tcl/Pkgfile
index 728dbab6f..f6f5df56d 100644
--- a/tcl/Pkgfile
+++ b/tcl/Pkgfile
@@ -6,7 +6,7 @@
 name=tcl
 version=8.5.7
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name$version-src.tar.gz)
+source=(http://download.sourceforge.net/$name/$name$version-src.tar.gz)
 
 build() {
 	cd $name$version/unix
diff --git a/tilda/Pkgfile b/tilda/Pkgfile
index 383a5c8c7..2206745e7 100644
--- a/tilda/Pkgfile
+++ b/tilda/Pkgfile
@@ -7,7 +7,7 @@
 name=tilda
 version=0.9.6
 release=2
-source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
   cd $name-$version
diff --git a/timidity/Pkgfile b/timidity/Pkgfile
index 555ecd87b..bbc911be7 100644
--- a/timidity/Pkgfile
+++ b/timidity/Pkgfile
@@ -7,7 +7,7 @@
 name=timidity
 version=2.13.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/timidity/TiMidity++-$version.tar.bz2)
+source=(http://download.sourceforge.net/timidity/TiMidity++-$version.tar.bz2)
 
 build() {
 	cd TiMidity++-$version
diff --git a/tk/Pkgfile b/tk/Pkgfile
index 3f004718d..abae743ba 100644
--- a/tk/Pkgfile
+++ b/tk/Pkgfile
@@ -7,7 +7,7 @@
 name=tk
 version=8.5.7
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/tcl/$name$version-src.tar.gz)
+source=(http://download.sourceforge.net/tcl/$name$version-src.tar.gz)
 
 build() {
 	cd $name$version/unix
diff --git a/tmw/Pkgfile b/tmw/Pkgfile
index 7c59eb521..393d8f924 100644
--- a/tmw/Pkgfile
+++ b/tmw/Pkgfile
@@ -6,7 +6,7 @@
 name=tmw
 version=0.0.29.1
 release=1
-source=(http://downloads.sourceforge.net/project/themanaworld/The%20Mana%20World/$version/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/themanaworld/The%20Mana%20World/$version/$name-$version.tar.gz)
 
 build() {
     cd $name-$version
diff --git a/transcode/Pkgfile b/transcode/Pkgfile
index c8a9747e6..cf3d56565 100644
--- a/transcode/Pkgfile
+++ b/transcode/Pkgfile
@@ -8,7 +8,7 @@ name=transcode
 version=1.1.5
 release=1
 source=(http://download.berlios.de/tcforge/$name-$version.tar.bz2
-	http://downloads.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz)
+	http://download.sourceforge.net/subtitleripper/subtitleripper-0.3-4.tgz)
 
 build() {
 	cd $name-$version
diff --git a/vba/Pkgfile b/vba/Pkgfile
index a7d56e591..b4be853ba 100644
--- a/vba/Pkgfile
+++ b/vba/Pkgfile
@@ -7,7 +7,7 @@
 name=vba
 version=1.7.2
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/vba/VisualBoyAdvance-src-$version.tar.gz)
+source=(http://download.sourceforge.net/vba/VisualBoyAdvance-src-$version.tar.gz)
 
 build() {
 	cd VisualBoyAdvance-$version
diff --git a/videotrans/Pkgfile b/videotrans/Pkgfile
index 238f9d4d6..5b434e858 100644
--- a/videotrans/Pkgfile
+++ b/videotrans/Pkgfile
@@ -7,7 +7,7 @@
 name=videotrans
 version=1.6.0
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/videotrans/videotrans-$version.tar.bz2)
+source=(http://download.sourceforge.net/videotrans/videotrans-$version.tar.bz2)
 
 build() {
 	cd videotrans-$version
diff --git a/warzone2100/Pkgfile b/warzone2100/Pkgfile
index 9e28de021..04d8fbad4 100644
--- a/warzone2100/Pkgfile
+++ b/warzone2100/Pkgfile
@@ -7,7 +7,7 @@
 name=warzone2100
 version=2.3.5
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/wesnoth-server/Pkgfile b/wesnoth-server/Pkgfile
index 9a774a4ad..edbc4db4a 100644
--- a/wesnoth-server/Pkgfile
+++ b/wesnoth-server/Pkgfile
@@ -7,7 +7,7 @@
 name=wesnoth-server
 version=1.8.4
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/wesnoth/wesnoth-$version.tar.bz2
+source=(http://download.sourceforge.net/wesnoth/wesnoth-$version.tar.bz2
 	wesnothd.rc)
 
 build() {
diff --git a/wesnoth/Pkgfile b/wesnoth/Pkgfile
index 8b15117f3..2575dcb7c 100644
--- a/wesnoth/Pkgfile
+++ b/wesnoth/Pkgfile
@@ -7,7 +7,7 @@
 name=wesnoth
 version=1.8.4
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/wmakerconf/Pkgfile b/wmakerconf/Pkgfile
index 753ec0753..5adef478f 100644
--- a/wmakerconf/Pkgfile
+++ b/wmakerconf/Pkgfile
@@ -7,7 +7,7 @@
 name=wmakerconf
 version=2.12
 release=2
-source=(http://dl.sourceforge.net/$name/${name}_$version.tar.gz)
+source=(http://download.sourceforge.net/$name/${name}_$version.tar.gz)
 
 build() {
 	cd $name-$version
diff --git a/wxpython/Pkgfile b/wxpython/Pkgfile
index 7150d124b..8365cc4f2 100644
--- a/wxpython/Pkgfile
+++ b/wxpython/Pkgfile
@@ -7,7 +7,7 @@
 name=wxpython
 version=2.8.9.2
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/$name/wxPython-src-$version.tar.bz2)
+source=(http://download.sourceforge.net/$name/wxPython-src-$version.tar.bz2)
 
 build() {
 	cd wxPython-src-$version/wxPython
diff --git a/xine-lib/Pkgfile b/xine-lib/Pkgfile
index c97c14dec..819172fb4 100644
--- a/xine-lib/Pkgfile
+++ b/xine-lib/Pkgfile
@@ -7,7 +7,7 @@
 name=xine-lib
 version=1.1.19
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/xine/$name-$version.tar.bz2)
+source=(http://download.sourceforge.net/xine/$name-$version.tar.bz2)
 
 build() {
 	cd $name-$version
diff --git a/xine-ui/Pkgfile b/xine-ui/Pkgfile
index ed2aebab2..960ac7b73 100644
--- a/xine-ui/Pkgfile
+++ b/xine-ui/Pkgfile
@@ -7,7 +7,7 @@
 name=xine-ui
 version=0.99.6
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/xine/$name-$version.tar.xz)
+source=(http://download.sourceforge.net/xine/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
diff --git a/xmltv/Pkgfile b/xmltv/Pkgfile
index 50e6d61a6..c5f670282 100644
--- a/xmltv/Pkgfile
+++ b/xmltv/Pkgfile
@@ -7,7 +7,7 @@
 name=xmltv
 version=0.5.58
 release=1
-source=(http://downloads.sourceforge.net/sourceforge/xmltv/xmltv-$version.tar.bz2)
+source=(http://download.sourceforge.net/xmltv/xmltv-$version.tar.bz2)
 
 build() {
 	cd xmltv-$version
diff --git a/xplanet/Pkgfile b/xplanet/Pkgfile
index 905efad6a..cd982a446 100644
--- a/xplanet/Pkgfile
+++ b/xplanet/Pkgfile
@@ -7,7 +7,7 @@
 name=xplanet
 version=1.2.1
 release=2
-source=(http://downloads.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
+source=(http://download.sourceforge.net/$name/$name-$version.tar.gz
 	xplanet-1.2.1.patch)
 
 build() {
diff --git a/zabbix_agentd/Pkgfile b/zabbix_agentd/Pkgfile
index 1e2888d13..8b65cdb88 100644
--- a/zabbix_agentd/Pkgfile
+++ b/zabbix_agentd/Pkgfile
@@ -6,7 +6,7 @@
 name=zabbix_agentd
 version=1.6.8
 release=1
-source=(http://dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz \
+source=(http://download.sourceforge.net/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz \
 		$name.conf $name)
 
 build() {
diff --git a/zabbix_server/Pkgfile b/zabbix_server/Pkgfile
index 547165453..aac48fd4c 100644
--- a/zabbix_server/Pkgfile
+++ b/zabbix_server/Pkgfile
@@ -6,7 +6,7 @@
 name=zabbix_server
 version=1.6.8
 release=1
-source=(http://dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz \
+source=(http://download.sourceforge.net/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz \
 		$name.conf $name)
 
 build() {
diff --git a/zabbix_utils/Pkgfile b/zabbix_utils/Pkgfile
index f0dfcca22..721a15d33 100644
--- a/zabbix_utils/Pkgfile
+++ b/zabbix_utils/Pkgfile
@@ -6,7 +6,7 @@
 name=zabbix_utils
 version=1.6.8
 release=1
-source=(http://dl.sourceforge.net/project/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz)
+source=(http://download.sourceforge.net/zabbix/ZABBIX%20Latest%20Stable/$version/zabbix-$version.tar.gz)
 
 build() {
 	cd zabbix-$version
diff --git a/zsnes/Pkgfile b/zsnes/Pkgfile
index f700eec84..9c26ca060 100644
--- a/zsnes/Pkgfile
+++ b/zsnes/Pkgfile
@@ -7,7 +7,7 @@
 name=zsnes
 version=1.51
 release=2
-source=(http://downloads.sourceforge.net/zsnes/zsnes${version/./}src.tar.bz2
+source=(http://download.sourceforge.net/zsnes/zsnes${version/./}src.tar.bz2
 	zsnes-1.51-gcc43.patch)
 
 build() {