diff --git a/packages/dev-tcl/tktable/tktable-2.10.exheres-0 b/packages/dev-tcl/tktable/tktable-2.10.exheres-0
index e56c4d9..23f16ab 100644
--- a/packages/dev-tcl/tktable/tktable-2.10.exheres-0
+++ b/packages/dev-tcl/tktable/tktable-2.10.exheres-0
@@ -1,11 +1,12 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+
 MY_PNV="Tktable${PV}"
 
+require sourceforge [ pnv=${MY_PNV} suffix=tar.gz ]
+
 SUMMARY="Full-featured 2D table widget"
-HOMEPAGE="http://tktable.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/tktable/${MY_PNV}.tar.gz"
 
 LICENCES="BSD-3"
 PLATFORMS="~amd64 ~x86"
diff --git a/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0 b/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0
index 3b535dd..47be68b 100644
--- a/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0
+++ b/packages/games-arcade/opensonic/opensonic-0.1.4.exheres-0
@@ -1,14 +1,13 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require cmake
-
 MY_PN=opensnc
 MY_PNV=${MY_PN}-src-${PV}
 
+require cmake
+require sourceforge [ project=opensnc pnv=${MY_PNV} suffix=tar.gz ]
+
 SUMMARY="A free open-source game based on the Sonic the Hedgehog universe"
-HOMEPAGE="http://opensnc.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/opensnc/Open%20Sonic/${PV}/${MY_PNV}.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
diff --git a/packages/games-board/capicity/capicity-1.0.exheres-0 b/packages/games-board/capicity/capicity-1.0.exheres-0
index 5cca7b0..9669016 100644
--- a/packages/games-board/capicity/capicity-1.0.exheres-0
+++ b/packages/games-board/capicity/capicity-1.0.exheres-0
@@ -3,11 +3,11 @@
 
 require gtk-icon-cache
 require qmake [ slot=4 ]
+require sourceforge [ project=capitalism pnv=CapiCity_${PV} suffix=tar.gz ]
 
 SUMMARY="A monopd compatible boardgame to play Monopoly-like games (previously named capitalism)"
 HOMEPAGE="http://linux-ecke.de/CapiCity/"
-DOWNLOADS="mirror://sourceforge/project/capitalism/Capi%20City/${PV}/Capid_${PV}.tar.gz
-    mirror://sourceforge/project/capitalism/Capi%20City/${PV}/CapiCity_${PV}.tar.gz"
+DOWNLOADS+=" mirror://sourceforge/project/capitalism/Capi%20City/${PV}/Capid_${PV}.tar.gz"
 
 LICENCES="GPL-2"
 SLOT="0"
diff --git a/packages/games-board/pioneers/pioneers-15.1.exheres-0 b/packages/games-board/pioneers/pioneers-15.1.exheres-0
index ed262de..edd8129 100644
--- a/packages/games-board/pioneers/pioneers-15.1.exheres-0
+++ b/packages/games-board/pioneers/pioneers-15.1.exheres-0
@@ -1,9 +1,9 @@
 # Copyright 2014 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require sourceforge [ project=pio suffix=tar.gz ]
+
 SUMMARY="A clone of the popular board game The Settlers of Catan"
-HOMEPAGE="http://pio.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/pio/${PNV}.tar.gz"
 
 LICENCES="GPL-2 CCPL-Attribution-ShareAlike-4.0"
 SLOT="0"
diff --git a/packages/games-board/pioneers/pioneers-15.3.exheres-0 b/packages/games-board/pioneers/pioneers-15.3.exheres-0
index ed262de..edd8129 100644
--- a/packages/games-board/pioneers/pioneers-15.3.exheres-0
+++ b/packages/games-board/pioneers/pioneers-15.3.exheres-0
@@ -1,9 +1,9 @@
 # Copyright 2014 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require sourceforge [ project=pio suffix=tar.gz ]
+
 SUMMARY="A clone of the popular board game The Settlers of Catan"
-HOMEPAGE="http://pio.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/pio/${PNV}.tar.gz"
 
 LICENCES="GPL-2 CCPL-Attribution-ShareAlike-4.0"
 SLOT="0"
diff --git a/packages/games-board/pysolfc/pysolfc-2.0.exheres-0 b/packages/games-board/pysolfc/pysolfc-2.0.exheres-0
index 4656395..27a9ba4 100644
--- a/packages/games-board/pysolfc/pysolfc-2.0.exheres-0
+++ b/packages/games-board/pysolfc/pysolfc-2.0.exheres-0
@@ -1,14 +1,13 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require setup-py [ import=distutils multibuild=false blacklist=3 python_opts="[tk]" ]
-
 MY_PN=PySolFC
 
+require setup-py [ import=distutils multibuild=false blacklist=3 python_opts="[tk]" ]
+require sourceforge [ project=pysolfc pnv=${MY_PN}-${PV} ]
+
 SUMMARY="An exciting collection of more than 1000 solitaire card games"
-HOMEPAGE="http://pysolfc.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/${PN}/${MY_PN}-${PV}.tar.bz2
-    mirror://sourceforge/${PN}/${MY_PN}-Cardsets-${PV}.tar.bz2"
+DOWNLOADS+=" mirror://sourceforge/${PN}/${MY_PN}-Cardsets-${PV}.tar.bz2"
 
 LICENCES="GPL-3"
 SLOT="0"
diff --git a/packages/games-fps/openarena/openarena-0.8.8.exheres-0 b/packages/games-fps/openarena/openarena-0.8.8.exheres-0
index a405608..2d24788 100644
--- a/packages/games-fps/openarena/openarena-0.8.8.exheres-0
+++ b/packages/games-fps/openarena/openarena-0.8.8.exheres-0
@@ -2,10 +2,11 @@
 # Copyright 2014-2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require sourceforge [ project=oarena pnv=${PN}-engine-source-${PV} ]
+
 SUMMARY="Open-source replacement for Quake 3 Arena"
 HOMEPAGE="http://openarena.ws/"
-DOWNLOADS="mirror://sourceforge/oarena/${PNV}.zip
-    mirror://sourceforge/oarena/src/${PN}-engine-source-${PV}.tar.bz2"
+DOWNLOADS+=" mirror://sourceforge/oarena/${PNV}.zip"
 
 LICENCES="GPL-2"
 SLOT="0"
diff --git a/packages/games-fps/sauerbraten/sauerbraten-2013.02.03.exheres-0 b/packages/games-fps/sauerbraten/sauerbraten-2013.02.03.exheres-0
index 0572448..82b04f4 100644
--- a/packages/games-fps/sauerbraten/sauerbraten-2013.02.03.exheres-0
+++ b/packages/games-fps/sauerbraten/sauerbraten-2013.02.03.exheres-0
@@ -1,12 +1,13 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require gtk-icon-cache
-
 EDITION="collect_edition"
+
+require gtk-icon-cache \
+    sourceforge [ pnv=sauerbraten_${PV//./_}_${EDITION}_linux ]
+
 SUMMARY="Cube 2: Sauerbraten is an open source game engine (Cube 2) with freeware game data (Sauerbraten)"
 HOMEPAGE="http://sauerbraten.org/"
-DOWNLOADS="mirror://sourceforge/sauerbraten/sauerbraten/2013_01_04/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2"
 
 LICENCES="ZLIB freedist"
 SLOT="0"
diff --git a/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0 b/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0
index a75d2ba..a5a183d 100644
--- a/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0
+++ b/packages/games-rpg/arx-libertatis/arx-libertatis-1.1.2.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake gtk-icon-cache
+require sourceforge [ project=arx suffix=tar.xz ]
 
 SUMMARY="Cross-platform port of Arx Fatalis, a first-person role-playing game"
 HOMEPAGE="http://arx-libertatis.org/"
-DOWNLOADS="mirror://sourceforge/arx/${PNV}/${PNV}.tar.xz"
 
 LICENCES="GPL-3"
 SLOT="0"
diff --git a/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0 b/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0
index af28c94..3ff6600 100644
--- a/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0
+++ b/packages/games-rpg/sumwars/sumwars-0.5.8.exheres-0
@@ -2,10 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake gtk-icon-cache flag-o-matic
+require sourceforge [ pnv=${PNV//_/-}-src ]
 
 SUMMARY="A multi-player, 3D action role-playing game"
 HOMEPAGE="http://sumwars.org"
-DOWNLOADS="mirror://sourceforge/sumwars/${PNV//_/-}-src.tar.bz2"
 
 LICENCES="GPL-3 CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
diff --git a/packages/games-strategy/dunelegacy/dunelegacy-0.96.3.exheres-0 b/packages/games-strategy/dunelegacy/dunelegacy-0.96.3.exheres-0
index 30d8089..442b788 100644
--- a/packages/games-strategy/dunelegacy/dunelegacy-0.96.3.exheres-0
+++ b/packages/games-strategy/dunelegacy/dunelegacy-0.96.3.exheres-0
@@ -3,10 +3,9 @@
 
 require gtk-icon-cache
 require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
+require sourceforge [ pnv=${PNV}-src ]
 
 SUMMARY="Updated clone of Westood Studios' Dune2"
-HOMEPAGE="http://dunelegacy.sourceforge.net"
-DOWNLOADS="mirror://sourceforge/${PN}/${PNV}-src.tar.bz2"
 
 LICENCES="GPL-2"
 SLOT="0"
diff --git a/packages/games-strategy/freesynd/freesynd-scm.exheres-0 b/packages/games-strategy/freesynd/freesynd-scm.exheres-0
index bc02c6d..215f46a 100644
--- a/packages/games-strategy/freesynd/freesynd-scm.exheres-0
+++ b/packages/games-strategy/freesynd/freesynd-scm.exheres-0
@@ -7,10 +7,10 @@ SCM_REPOSITORY="http://svn.code.sf.net/p/freesynd/code/freesynd/trunk"
 require desktop-utils
 require gtk-icon-cache
 require cmake [ out_of_source=false ]
+require sourceforge
 require scm-svn
 
 SUMMARY="A cross-platform reimplementation of engine for the classic Bullfrog game, Syndicate"
-HOMEPAGE="http://freesynd.sourceforge.net/"
 
 LICENCES="GPL-3"
 SLOT="0"
diff --git a/packages/media-libs/allegro/allegro-4.4.2.exheres-0 b/packages/media-libs/allegro/allegro-4.4.2.exheres-0
index 49a9e3c..04b3390 100644
--- a/packages/media-libs/allegro/allegro-4.4.2.exheres-0
+++ b/packages/media-libs/allegro/allegro-4.4.2.exheres-0
@@ -3,10 +3,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 require cmake [ out_of_source=false ]
+require sourceforge [ project=alleg suffix=tar.gz ]
 
 SUMMARY="cross-platform multimedia library"
-HOMEPAGE="http://alleg.sourceforge.net/"
-DOWNLOADS="mirror://sourceforge/alleg/${PNV}.tar.gz"
 
 LICENCES="Allegro MIT GPL-2 ZLIB"
 SLOT="0"
diff --git a/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0 b/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0
index c849ffb..7b9a247 100644
--- a/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0
+++ b/packages/net-firewall/pglinux/pglinux-2.3.1.exheres-0
@@ -1,13 +1,12 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-require gtk-icon-cache
+MY_PNV="pgl-${PV}"
 
-MY_P="pgl-${PV}"
+require gtk-icon-cache
+require sourceforge [ project=peerguardian suffix=tar.gz ]
 
 SUMMARY="Privacy oriented firewall application"
-HOMEPAGE="https://sourceforge.net/projects/peerguardian/"
-DOWNLOADS="mirror://sourceforge/peerguardian/${MY_P}.tar.gz"
 
 LICENCES="GPL-3"
 PLATFORMS="~amd64 ~x86"
@@ -50,7 +49,7 @@ DEPENDENCIES="
         )
 "
 
-WORK=${WORKBASE}/${MY_P}
+WORK=${WORKBASE}/${MY_PNV}
 
 DEFAULT_SRC_CONFIGURE_PARAMS=(
     --localstatedir=/var