diff --git a/helper-templates/unzip-extraction.sh b/helper-templates/unzip-extraction.sh
index b390fddaf55..5ee4f38cfca 100644
--- a/helper-templates/unzip-extraction.sh
+++ b/helper-templates/unzip-extraction.sh
@@ -1,10 +1,20 @@
 #
 # This helper is used in templates using extract_sufx=".zip".
-# This checks if unzip is installed and installs it if it's not
-# and sets the unzip_cmd/extract_cmd variables appropiately.
+# This checks if unzip is installed and installs it if it's not.
 #
 # If unzip is already installed just return immediately.
 
+extract_unzip()
+{
+	local file="$1"
+	local dest="$2"
+
+	[ ! -f $file ] && exit 1
+
+	$XBPS_MASTERDIR/bin/unzip -q -x $file -d $dest
+	return $?
+}
+
 if [ ! -x "$XBPS_MASTERDIR/bin/unzip" ]; then
 	unzip_version="5.52"
 
@@ -13,7 +23,7 @@ if [ ! -x "$XBPS_MASTERDIR/bin/unzip" ]; then
 
 	check_installed_pkg unzip $unzip_version
 	if [ $? -ne 0 ]; then
-		echo "=> \`\`$pkg´´ package requires unzip for extraction."
+		echo "=> \`\`$save_pkgname´´ package requires unzip for extraction."
 		#
 		# Install dependencies required by unzip.
 		#
@@ -32,6 +42,3 @@ if [ ! -x "$XBPS_MASTERDIR/bin/unzip" ]; then
 	unset save_pkgname
 	unset unzip_version
 fi
-
-unzip_cmd=$XBPS_MASTERDIR/bin/unzip
-extract_cmd="$unzip_cmd -x $dfile -d $XBPS_BUILDDIR"
diff --git a/templates/MesaLib.tmpl b/templates/MesaLib.tmpl
index 657a2af8f40..fbb4882c2b5 100644
--- a/templates/MesaLib.tmpl
+++ b/templates/MesaLib.tmpl
@@ -2,9 +2,9 @@
 pkgname=MesaLib
 version=7.2
 patch_files="$pkgname-fix-dri-build.diff"
-wrksrc=Mesa-$version
-extract_sufx=".tar.bz2"
-url=http://kent.dl.sourceforge.net/sourceforge/mesa3d
+wrksrc="Mesa-$version"
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/mesa3d/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_build_args="MKDEP=mkdep"
 configure_args="--with-expat=$XBPS_MASTERDIR"
diff --git a/templates/atk.tmpl b/templates/atk.tmpl
index 7ce4d5b5b7f..ace3af7a38a 100644
--- a/templates/atk.tmpl
+++ b/templates/atk.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'atk'.
 pkgname=atk
 version=1.24.0
-extract_sufx=".tar.bz2"
-url=http://ftp.gnome.org/pub/GNOME/sources/atk/1.24
+distfiles="
+http://ftp.gnome.org/pub/GNOME/sources/atk/1.24/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="atk.pc"
diff --git a/templates/autoconf.tmpl b/templates/autoconf.tmpl
index abde32c87a3..179dbe5e3ac 100644
--- a/templates/autoconf.tmpl
+++ b/templates/autoconf.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'autoconf'.
 pkgname=autoconf
 version=2.63
-extract_sufx=".tar.gz"
-url=http://ftp.gnu.org/gnu/autoconf
+distfiles="http://ftp.gnu.org/gnu/autoconf/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 short_desc="Generates automatic source code configuration scripts"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/automake.tmpl b/templates/automake.tmpl
index 3d83c5c0c88..cc3a14ed3c7 100644
--- a/templates/automake.tmpl
+++ b/templates/automake.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'automake'.
 pkgname=automake
 version=1.10.1
-extract_sufx=".tar.bz2"
-url=http://ftp.gnu.org/gnu/automake
+distfiles="http://ftp.gnu.org/gnu/automake/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="GNU Standards-compliant Makefile generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/babl.tmpl b/templates/babl.tmpl
index 669eead37fe..66de545c87d 100644
--- a/templates/babl.tmpl
+++ b/templates/babl.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'babl'.
 pkgname=babl
 version=0.0.22
-extract_sufx=".tar.bz2"
-url=ftp://ftp.gtk.org/pub/babl/0.0
+distfiles="ftp://ftp.gtk.org/pub/babl/0.0/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="babl.pc"
diff --git a/templates/bdftopcf.tmpl b/templates/bdftopcf.tmpl
index 0aca2426fc6..93c935c00ec 100644
--- a/templates/bdftopcf.tmpl
+++ b/templates/bdftopcf.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'bdftopcf'.
 pkgname=bdftopcf
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="BDF to PCF font converter for X11"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/bigreqsproto.tmpl b/templates/bigreqsproto.tmpl
index b65a9a81695..a98961e3ab8 100644
--- a/templates/bigreqsproto.tmpl
+++ b/templates/bigreqsproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'bigreqsproto'
 pkgname=bigreqsproto
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="bigreqsproto.pc"
 short_desc="BigReqs extension headers from modular Xorg X11"
diff --git a/templates/cairo.tmpl b/templates/cairo.tmpl
index b3285ba1613..10ac8b0ff56 100644
--- a/templates/cairo.tmpl
+++ b/templates/cairo.tmpl
@@ -2,8 +2,7 @@
 pkgname=cairo
 version=1.7.6
 patch_files="$pkgname-doc-public-Makefile-in.diff"
-extract_sufx=".tar.gz"
-url=http://cairographics.org/snapshots
+distfiles="http://cairographics.org/snapshots/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_args="--enable-glitz --enable-pdf --enable-ps"
diff --git a/templates/compositeproto.tmpl b/templates/compositeproto.tmpl
index 4652162f1ba..32a9d9bbe89 100644
--- a/templates/compositeproto.tmpl
+++ b/templates/compositeproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'compositeproto'.
 pkgname=compositeproto
 version=0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="compositeproto.pc"
 short_desc="Composite extension headers from modular X.org"
diff --git a/templates/curl.tmpl b/templates/curl.tmpl
index 4a98d901c48..6c820b244f6 100644
--- a/templates/curl.tmpl
+++ b/templates/curl.tmpl
@@ -1,8 +1,7 @@
 # Template file for 'curl'
 pkgname=curl
 version=7.19.0
-extract_sufx=".tar.bz2"
-url=http://curl.haxx.se/download/
+distfiles="http://curl.haxx.se/download/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-ldaps"
 pkgconfig_override="libcurl.pc"
diff --git a/templates/damageproto.tmpl b/templates/damageproto.tmpl
index 0e080ecc05f..3983dfbf61b 100644
--- a/templates/damageproto.tmpl
+++ b/templates/damageproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'damageproto'.
 pkgname=damageproto
 version=1.1.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="damageproto.pc"
 short_desc="Damage extension headers from modular X.org"
diff --git a/templates/dmxproto.tmpl b/templates/dmxproto.tmpl
index 19ad59e6781..8ac9ae486ab 100644
--- a/templates/dmxproto.tmpl
+++ b/templates/dmxproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'dmxproto'.
 pkgname=dmxproto
 version=2.2.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="dmxproto.pc"
 short_desc="Distributed Multi-headed X protocol headers from modular X.org"
diff --git a/templates/encodings.tmpl b/templates/encodings.tmpl
index 3a89b1aed17..12ff3299452 100644
--- a/templates/encodings.tmpl
+++ b/templates/encodings.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'encodings'.
 pkgname=encodings
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="X11 Font Index Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/epdfview.tmpl b/templates/epdfview.tmpl
index e61f6b8d108..d642870def1 100644
--- a/templates/epdfview.tmpl
+++ b/templates/epdfview.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'epdfview'.
 pkgname=epdfview
 version=0.1.6
-extract_sufx=".tar.bz2"
-url=http://trac.emma-soft.com/epdfview/chrome/site/releases
+distfiles="
+http://trac.emma-soft.com/epdfview/chrome/site/releases/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 ignore_files="charset.alias"
 short_desc="Lightweight PDF viewer using Poppler and GTK+"
diff --git a/templates/evieext.tmpl b/templates/evieext.tmpl
index 1add4f0ac17..31dbec68384 100644
--- a/templates/evieext.tmpl
+++ b/templates/evieext.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'evieext'.
 pkgname=evieext
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="evieproto.pc"
 short_desc="EvIE extension headers"
diff --git a/templates/expat.tmpl b/templates/expat.tmpl
index 24f56afdb67..f8d3f3538df 100644
--- a/templates/expat.tmpl
+++ b/templates/expat.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'expat'
 pkgname=expat
 version=2.0.1
-extract_sufx=".tar.gz"
-url=http://kent.dl.sourceforge.net/sourceforge/expat
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/expat/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 short_desc="XML parser library written in C"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/firefox.tmpl b/templates/firefox.tmpl
index b55657158e5..89efc56b831 100644
--- a/templates/firefox.tmpl
+++ b/templates/firefox.tmpl
@@ -3,9 +3,8 @@ pkgname=firefox
 version=3.0.3
 wrksrc=mozilla
 patch_files="$pkgname-fix-build.diff"
-distfiles="$pkgname-$version-source$extract_sufx"
-extract_sufx=".tar.bz2"
-url=http://sunsite.rediris.es/pub/mozilla.org/firefox/releases/3.0.3/source
+distfiles="
+http://sunsite.rediris.es/pub/mozilla.org/firefox/releases/3.0.3/source/$pkgname-$version-source@.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-default-toolkit=cairo-gtk2 --disable-dbus
  --disable-crashreporter --enable-xft --with-pthreads --enable-xinerama
diff --git a/templates/fixesproto.tmpl b/templates/fixesproto.tmpl
index 2e69e729316..6a6c4530d18 100644
--- a/templates/fixesproto.tmpl
+++ b/templates/fixesproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'fixesproto'.
 pkgname=fixesproto
 version=4.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="fixesproto.pc"
 short_desc="Fixes extension headers from X.org"
diff --git a/templates/font-adobe-100dpi.tmpl b/templates/font-adobe-100dpi.tmpl
index 95aab507196..aca1adb6c47 100644
--- a/templates/font-adobe-100dpi.tmpl
+++ b/templates/font-adobe-100dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-adobe-100dpi'.
 pkgname=font-adobe-100dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Adobe PCF fonts"
diff --git a/templates/font-adobe-75dpi.tmpl b/templates/font-adobe-75dpi.tmpl
index 22e86d6b907..4eca105a790 100644
--- a/templates/font-adobe-75dpi.tmpl
+++ b/templates/font-adobe-75dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-adobe-75dpi'.
 pkgname=font-adobe-75dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 75pi Adobe PCF fonts"
diff --git a/templates/font-adobe-utopia-100dpi.tmpl b/templates/font-adobe-utopia-100dpi.tmpl
index 5faebcd7539..94c0638da0d 100644
--- a/templates/font-adobe-utopia-100dpi.tmpl
+++ b/templates/font-adobe-utopia-100dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-adobe-utopia-100dpi'.
 pkgname=font-adobe-utopia-100dpi
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Adobe Utopia PCF fonts"
diff --git a/templates/font-adobe-utopia-75dpi.tmpl b/templates/font-adobe-utopia-75dpi.tmpl
index 357eb6cb426..62eac44e040 100644
--- a/templates/font-adobe-utopia-75dpi.tmpl
+++ b/templates/font-adobe-utopia-75dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-adobe-utopia-75dpi'.
 pkgname=font-adobe-utopia-75dpi
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Adobe Utopia PCF fonts"
diff --git a/templates/font-adobe-utopia-type1.tmpl b/templates/font-adobe-utopia-type1.tmpl
index 6f982868faf..78e192b8a2e 100644
--- a/templates/font-adobe-utopia-type1.tmpl
+++ b/templates/font-adobe-utopia-type1.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-adobe-utopia-type1'.
 pkgname=font-adobe-utopia-type1
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Adobe Utopia Type1 fonts"
diff --git a/templates/font-alias.tmpl b/templates/font-alias.tmpl
index 5f73bc26d33..6796677b34c 100644
--- a/templates/font-alias.tmpl
+++ b/templates/font-alias.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-alias'.
 pkgname=font-alias
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Standard aliases for X11 PCF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/font-bh-100dpi.tmpl b/templates/font-bh-100dpi.tmpl
index a92388980ca..58e754813bd 100644
--- a/templates/font-bh-100dpi.tmpl
+++ b/templates/font-bh-100dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bh-100dpi'.
 pkgname=font-bh-100dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Bigelow & Holmes PCF fonts"
diff --git a/templates/font-bh-75dpi.tmpl b/templates/font-bh-75dpi.tmpl
index 2bb52d9fc57..02d05fcd7bd 100644
--- a/templates/font-bh-75dpi.tmpl
+++ b/templates/font-bh-75dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bh-75dpi'.
 pkgname=font-bh-75dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 75dpi Bigelow & Holmes PCF fonts"
diff --git a/templates/font-bh-lucidatypewriter-100dpi.tmpl b/templates/font-bh-lucidatypewriter-100dpi.tmpl
index 7ab11eb7c0c..e04e9c843ba 100644
--- a/templates/font-bh-lucidatypewriter-100dpi.tmpl
+++ b/templates/font-bh-lucidatypewriter-100dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bh-lucidatypewriter-100dpi'.
 pkgname=font-bh-lucidatypewriter-100dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="100dpi Bigelow & Holmes Lucida Typewriter PCF fonts"
diff --git a/templates/font-bh-lucidatypewriter-75dpi.tmpl b/templates/font-bh-lucidatypewriter-75dpi.tmpl
index ec49b1dbeb6..0b3839352d6 100644
--- a/templates/font-bh-lucidatypewriter-75dpi.tmpl
+++ b/templates/font-bh-lucidatypewriter-75dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bh-lucidatypewriter-75dpi'.
 pkgname=font-bh-lucidatypewriter-75dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="75dpi Bigelow & Holmes Lucida Typewriter PCF fonts"
diff --git a/templates/font-bh-ttf.tmpl b/templates/font-bh-ttf.tmpl
index b83239d1b6a..c1fd3a824b9 100644
--- a/templates/font-bh-ttf.tmpl
+++ b/templates/font-bh-ttf.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bh-ttf'.
 pkgname=font-bh-ttf
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Bigelow & Holmes TrueType fonts"
diff --git a/templates/font-bh-type1.tmpl b/templates/font-bh-type1.tmpl
index 35c7d7a62eb..2535bac819c 100644
--- a/templates/font-bh-type1.tmpl
+++ b/templates/font-bh-type1.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bh-type1'.
 pkgname=font-bh-type1
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Bigelow & Holmes Type1 fonts"
diff --git a/templates/font-bitstream-100dpi.tmpl b/templates/font-bitstream-100dpi.tmpl
index 7257c4acd37..a34a53d327f 100644
--- a/templates/font-bitstream-100dpi.tmpl
+++ b/templates/font-bitstream-100dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bitstream-100dpi'.
 pkgname=font-bitstream-100dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Bitstream PCF fonts"
diff --git a/templates/font-bitstream-75dpi.tmpl b/templates/font-bitstream-75dpi.tmpl
index f79be4106f6..5fb5c434481 100644
--- a/templates/font-bitstream-75dpi.tmpl
+++ b/templates/font-bitstream-75dpi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bitstream-75dpi'.
 pkgname=font-bitstream-75dpi
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard 100dpi Bitstream PCF fonts"
diff --git a/templates/font-bitstream-speedo.tmpl b/templates/font-bitstream-speedo.tmpl
index b114e9ee01f..3fe4ee16932 100644
--- a/templates/font-bitstream-speedo.tmpl
+++ b/templates/font-bitstream-speedo.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bitstream-speedo'.
 pkgname=font-bitstream-speedo
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Speedo Bitstream PCF fonts"
diff --git a/templates/font-bitstream-type1.tmpl b/templates/font-bitstream-type1.tmpl
index b585d0dd1d3..2c3f1d28065 100644
--- a/templates/font-bitstream-type1.tmpl
+++ b/templates/font-bitstream-type1.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-bitstream-type1'.
 pkgname=font-bitstream-type1
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard Type1 Bitstream PCF fonts"
diff --git a/templates/font-cursor-misc.tmpl b/templates/font-cursor-misc.tmpl
index 47c171e2954..4251c583b20 100644
--- a/templates/font-cursor-misc.tmpl
+++ b/templates/font-cursor-misc.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-cursor-misc'.
 pkgname=font-cursor-misc
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Standard X11 cursors in PCF format"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/font-misc-misc.tmpl b/templates/font-misc-misc.tmpl
index 6a7b2a95cfc..48e10b4e893 100644
--- a/templates/font-misc-misc.tmpl
+++ b/templates/font-misc-misc.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-misc-misc'.
 pkgname=font-misc-misc
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard X11 \"fixed\" PCF fonts"
diff --git a/templates/font-util.tmpl b/templates/font-util.tmpl
index 2d7c64dcaf4..03d6a80fdde 100644
--- a/templates/font-util.tmpl
+++ b/templates/font-util.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'font-util'.
 pkgname=font-util
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/font
+distfiles="
+http://xorg.freedesktop.org/releases/individual/font/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Tools for truncating and subseting of ISO10646-1 BDF fonts"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/fontcacheproto.tmpl b/templates/fontcacheproto.tmpl
index de3c0d99474..4ccab01b9d3 100644
--- a/templates/fontcacheproto.tmpl
+++ b/templates/fontcacheproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'fontcacheproto'.
 pkgname=fontcacheproto
 version=0.1.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="fontcacheproto.pc"
 short_desc="Fontcache extension headers from X.org"
diff --git a/templates/fontconfig.tmpl b/templates/fontconfig.tmpl
index f396be1367d..9350c45ce80 100644
--- a/templates/fontconfig.tmpl
+++ b/templates/fontconfig.tmpl
@@ -2,8 +2,7 @@
 pkgname=fontconfig
 version=2.6.0
 patch_files="$pkgname-Makefile-fc-cache.diff"
-extract_sufx=".tar.gz"
-url=http://www.fontconfig.org/release
+distfiles="http://www.fontconfig.org/release/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--with-add-fonts=$XBPS_MASTERDIR/lib/X11/fonts
  --enable-docs --with-default-fonts=$XBPS_MASTERDIR/lib/X11/fonts"
diff --git a/templates/fontsproto.tmpl b/templates/fontsproto.tmpl
index 9852b128b7f..d459d640261 100644
--- a/templates/fontsproto.tmpl
+++ b/templates/fontsproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'fontsproto'.
 pkgname=fontsproto
 version=2.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="fontsproto.pc"
 short_desc="Fonts extension headers from X.org"
diff --git a/templates/freeglut.tmpl b/templates/freeglut.tmpl
index 4c9bb7f0b76..58b4a0083a4 100644
--- a/templates/freeglut.tmpl
+++ b/templates/freeglut.tmpl
@@ -2,8 +2,8 @@
 pkgname=freeglut
 version=2.4.0
 patch_files="$pkgname-src-Makefile-in.diff"
-extract_sufx=".tar.gz"
-url=http://surfnet.dl.sourceforge.net/sourceforge/freeglut
+distfiles="
+http://surfnet.dl.sourceforge.net/sourceforge/freeglut/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-warnings"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/freetype2.tmpl b/templates/freetype2.tmpl
index aef5fdf446a..45caab71aa4 100644
--- a/templates/freetype2.tmpl
+++ b/templates/freetype2.tmpl
@@ -1,9 +1,9 @@
 # Template build file for 'freetype2'.
 pkgname=freetype2
 version=2.3.7
-extract_sufx=".tar.bz2"
-distfiles="freetype-$version"
-url=http://download.savannah.gnu.org/releases/freetype
+wrksrc="freetype-$version"
+distfiles="
+http://download.savannah.gnu.org/releases/freetype/freetype-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_env="GNUMAKE=$make_cmd"
diff --git a/templates/gegl.tmpl b/templates/gegl.tmpl
index 6d9a066f2bb..8372c05082f 100644
--- a/templates/gegl.tmpl
+++ b/templates/gegl.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'gegl'.
 pkgname=gegl
 version=0.0.20
-extract_sufx=".tar.bz2"
-url=ftp://ftp.gimp.org/pub/gegl/0.0
+distfiles="ftp://ftp.gimp.org/pub/gegl/0.0/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="gegl.pc"
diff --git a/templates/gettext-runtime.tmpl b/templates/gettext-runtime.tmpl
index 9033d00c4c0..ef027902a4d 100644
--- a/templates/gettext-runtime.tmpl
+++ b/templates/gettext-runtime.tmpl
@@ -2,10 +2,9 @@
 pkgname=gettext-runtime
 version=0.17
 patch_files="$pkgname-fix-build.diff"
-distfiles="gettext-$version"
 wrksrc="gettext-$version/gettext-runtime"
-extract_sufx=".tar.gz"
-url=http://ftp.gnu.org/pub/gnu/gettext
+distfiles="
+http://ftp.gnu.org/pub/gnu/gettext/gettext-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-libasprintf"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/gettext-tools.tmpl b/templates/gettext-tools.tmpl
index 038ffe69829..8b50e28b2f6 100644
--- a/templates/gettext-tools.tmpl
+++ b/templates/gettext-tools.tmpl
@@ -2,10 +2,9 @@
 pkgname=gettext-tools
 version=0.17
 patch_files="$pkgname-fix-install.diff"
-distfiles="gettext-$version"
 wrksrc="gettext-$version/gettext-tools"
-extract_sufx=".tar.gz"
-url=http://ftp.gnu.org/pub/gnu/gettext
+distfiles="
+http://ftp.gnu.org/pub/gnu/gettext/gettext-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-libasprintf --without-emacs --disable-java
  --disable-native-java --enable-threads=posix --disable-openmp
diff --git a/templates/gimp.tmpl b/templates/gimp.tmpl
index 065a95fbed3..e09d9f7b58f 100644
--- a/templates/gimp.tmpl
+++ b/templates/gimp.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'gimp'.
 pkgname=gimp
 version=2.6.1
-extract_sufx=".tar.bz2"
-url=http://sunsite.rediris.es/mirror/gimp/v2.6
+distfiles="
+http://sunsite.rediris.es/mirror/gimp/v2.6/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-python"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/git.tmpl b/templates/git.tmpl
index 1f53406f9ac..ac8eb288497 100644
--- a/templates/git.tmpl
+++ b/templates/git.tmpl
@@ -2,8 +2,8 @@
 pkgname=git
 version=1.6.0.2
 patch_files="$pkgname-fix-install.diff"
-extract_sufx=".tar.bz2"
-url=http://www.kernel.org/pub/software/scm/git
+distfiles="
+http://www.kernel.org/pub/software/scm/git/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_env="CURLDIR=$XBPS_MASTERDIR"
 configure_args="--with-shell=/bin/sh --with-perl=$XBPS_MASTERDIR/bin/perl
diff --git a/templates/gkrellm.tmpl b/templates/gkrellm.tmpl
index c5310026958..7b90d426918 100644
--- a/templates/gkrellm.tmpl
+++ b/templates/gkrellm.tmpl
@@ -2,8 +2,8 @@
 pkgname=gkrellm
 version=2.3.2
 patch_files="$pkgname-fix-sensors.diff"
-extract_sufx=".tar.bz2"
-url=http://members.dslextreme.com/users/billw/gkrellm
+distfiles="
+http://members.dslextreme.com/users/billw/gkrellm/$pkgname-$version@.tar.bz2"
 build_style=gnu_makefile
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 make_build_target="netbsd2"
diff --git a/templates/glib.tmpl b/templates/glib.tmpl
index 2d73d2b87fd..ea357be2754 100644
--- a/templates/glib.tmpl
+++ b/templates/glib.tmpl
@@ -1,9 +1,9 @@
 # Template build file for 'glib'
 pkgname=glib
 version=2.18.1
-extract_sufx=".tar.bz2"
 patch_files="$pkgname-fix-statfs-netbsd.diff"
-url=http://ftp.gnome.org/pub/gnome/sources/glib/2.18
+distfiles="
+http://ftp.gnome.org/pub/gnome/sources/glib/2.18/$pkgname-$version@.tar.bz2"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 # Disable FAM for now and use the installed pcre package instead
 # of the supplied one.
diff --git a/templates/glitz.tmpl b/templates/glitz.tmpl
index 0c0404054b0..55b531ea3d3 100644
--- a/templates/glitz.tmpl
+++ b/templates/glitz.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'glitz'.
 pkgname=glitz
 version=0.5.6
-extract_sufx=".tar.gz"
-url=http://cairographics.org/snapshots
+distfiles="
+http://cairographics.org/snapshots/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--with-x"
 pkgconfig_override="glitz.pc glitz-glx.pc"
diff --git a/templates/glproto.tmpl b/templates/glproto.tmpl
index ee35fa39ca8..9cb338f93c9 100644
--- a/templates/glproto.tmpl
+++ b/templates/glproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'glproto'.
 pkgname=glproto
 version=1.4.9
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="glproto.pc"
 short_desc="GL extension headers"
diff --git a/templates/gmake.tmpl b/templates/gmake.tmpl
index 6351a076231..fcccf989185 100644
--- a/templates/gmake.tmpl
+++ b/templates/gmake.tmpl
@@ -2,9 +2,8 @@
 pkgname=gmake
 version=3.81
 wrksrc="make-$version"
-extract_sufx=".tar.bz2"
-distfiles="make-$version"
-url=http://ftp.gnu.org/pub/gnu/make
+distfiles="
+http://ftp.gnu.org/pub/gnu/make/make-$version@.tar.bz2"
 configure_args="--program-prefix=g"
 build_style=gnu_configure
 short_desc="The GNU make system"
diff --git a/templates/gtk+.tmpl b/templates/gtk+.tmpl
index 078f0793840..c17b1465071 100644
--- a/templates/gtk+.tmpl
+++ b/templates/gtk+.tmpl
@@ -2,8 +2,8 @@
 pkgname=gtk+
 version=2.14.3
 patch_files="$pkgname-tests-Makefile-in.diff"
-extract_sufx=".tar.bz2"
-url=http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14
+distfiles="
+http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.14/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-cups"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/hicolor-icon-theme.tmpl b/templates/hicolor-icon-theme.tmpl
index 2d27d9e31a3..dc51a19ffdd 100644
--- a/templates/hicolor-icon-theme.tmpl
+++ b/templates/hicolor-icon-theme.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'hicolor-icon-theme'.
 pkgname=hicolor-icon-theme
 version=0.10
-extract_sufx=".tar.gz"
-url=http://icon-theme.freedesktop.org/releases
+distfiles="
+http://icon-theme.freedesktop.org/releases/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Standard icon theme called hicolor"
diff --git a/templates/imlib2.tmpl b/templates/imlib2.tmpl
index a275104e554..f881ed1ad77 100644
--- a/templates/imlib2.tmpl
+++ b/templates/imlib2.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'imlib2'.
 pkgname=imlib2
 version=1.4.0
-extract_sufx=".tar.gz"
-url=http://kent.dl.sourceforge.net/sourceforge/enlightenment
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/enlightenment/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 short_desc="Image manipulation library"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/inputproto.tmpl b/templates/inputproto.tmpl
index 7983c893ddc..aa80566bbe9 100644
--- a/templates/inputproto.tmpl
+++ b/templates/inputproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'inputproto'
 pkgname=inputproto
 version=1.4.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="inputproto.pc"
 short_desc="Input extension headers from X.org"
diff --git a/templates/intltool.tmpl b/templates/intltool.tmpl
index f34e2e289ba..2f02e0730a9 100644
--- a/templates/intltool.tmpl
+++ b/templates/intltool.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'intltool'.
 pkgname=intltool
 version=0.40.4
-extract_sufx=".tar.bz2"
-url=http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40
+distfiles="
+http://ftp.gnome.org/pub/GNOME/sources/intltool/0.40/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Toolbox for internationalisation"
diff --git a/templates/irssi.tmpl b/templates/irssi.tmpl
index 1a5f350feed..6e3fa37a2ea 100644
--- a/templates/irssi.tmpl
+++ b/templates/irssi.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'irssi'
 pkgname=irssi
 version=0.8.12
-extract_sufx=".tar.bz2"
-url=http://www.irssi.org/files
+distfiles="http://www.irssi.org/files/$pkgname-$version@.tar.bz2"
 # We need this to get some perl paths.
 . $XBPS_TMPLHELPDIR/perl-module.sh
 
diff --git a/templates/iso-codes.tmpl b/templates/iso-codes.tmpl
index e2d5dcadd0d..a1db9645a90 100644
--- a/templates/iso-codes.tmpl
+++ b/templates/iso-codes.tmpl
@@ -2,8 +2,8 @@
 pkgname=iso-codes
 version=3.3
 patch_files="$pkgname-fix-pkgconfig.diff"
-extract_sufx=".tar.bz2"
-url=ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes
+distfiles="
+ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="iso-codes.pc"
diff --git a/templates/jasper.tmpl b/templates/jasper.tmpl
index bae457b9518..8d10189079d 100644
--- a/templates/jasper.tmpl
+++ b/templates/jasper.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'jasper'.
 pkgname=jasper
 version=1.900.1
-extract_sufx=".zip"
-url=http://www.ece.uvic.ca/~mdadams/jasper/software
+distfiles="
+http://www.ece.uvic.ca/~mdadams/jasper/software/$pkgname-$version@.zip"
 build_style=gnu_configure
 configure_args="--enable-shared --without-x --disable-opengl"
 short_desc="Software-based reference implementation of the JPEG-2000 codec"
diff --git a/templates/jpeg.tmpl b/templates/jpeg.tmpl
index 14153474fd7..1adbdf11bed 100644
--- a/templates/jpeg.tmpl
+++ b/templates/jpeg.tmpl
@@ -3,9 +3,8 @@ pkgname=jpeg
 version=6.0b
 wrksrc=$pkgname-6b
 patch_files="$pkgname-makefile-cfg.diff"
-distfiles="jpegsrc.v6b"
-extract_sufx=".tar.gz"
-url=ftp://ftp.fu-berlin.de/unix/graphics/jpeg
+distfiles="
+ftp://ftp.fu-berlin.de/unix/graphics/jpeg/jpegsrc.v6b@.tar.gz"
 build_style=gnu_configure
 make_install_target="install install-lib"
 configure_args="--enable-shared --enable-static"
diff --git a/templates/kbproto.tmpl b/templates/kbproto.tmpl
index 343f6831129..0ccd29d7056 100644
--- a/templates/kbproto.tmpl
+++ b/templates/kbproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'kbproto'
 pkgname=kbproto
 version=1.0.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="kbproto.pc"
 short_desc="KB extension headers from X.org"
diff --git a/templates/lcms.tmpl b/templates/lcms.tmpl
index d16ca8a7a3a..eda332367de 100644
--- a/templates/lcms.tmpl
+++ b/templates/lcms.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'lcms'.
 pkgname=lcms
 version=1.17
-extract_sufx=".tar.gz"
-url=http://www.littlecms.com
+distfiles="http://www.littlecms.com/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 pkgconfig_override="lcms.pc"
 short_desc="Light Color Management System -- a color management library"
diff --git a/templates/libICE.tmpl b/templates/libICE.tmpl
index d438e31a31a..d8a109e8ed2 100644
--- a/templates/libICE.tmpl
+++ b/templates/libICE.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libICE'.
 pkgname=libICE
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="ice.pc"
 short_desc="Inter Client Exchange (ICE) library for X"
diff --git a/templates/libIDL.tmpl b/templates/libIDL.tmpl
index 3bd0b26da1f..7600232da10 100644
--- a/templates/libIDL.tmpl
+++ b/templates/libIDL.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libIDL'.
 pkgname=libIDL
 version=0.8.11
-extract_sufx=".tar.bz2"
-url=http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8
+distfiles="
+http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_env="HAVE_YACC=yes"
 pkgconfig_override="libIDL-2.0.pc"
diff --git a/templates/libSM.tmpl b/templates/libSM.tmpl
index 57d1e2e5f84..e9e5b21b8cc 100644
--- a/templates/libSM.tmpl
+++ b/templates/libSM.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libSM'.
 pkgname=libSM
 version=1.1.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--without-libuuid"
 pkgconfig_override="sm.pc"
diff --git a/templates/libX11.tmpl b/templates/libX11.tmpl
index cb5ea104353..c86ba18e5ae 100644
--- a/templates/libX11.tmpl
+++ b/templates/libX11.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'libX11'
 pkgname=libX11
 version=1.1.5
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="x11.pc"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/libXau.tmpl b/templates/libXau.tmpl
index 029cf9fda4a..35a6abacf7e 100644
--- a/templates/libXau.tmpl
+++ b/templates/libXau.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'libXau'
 pkgname=libXau
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xau.pc"
 short_desc="Authorization Protocol for X from X.org"
diff --git a/templates/libXaw.tmpl b/templates/libXaw.tmpl
index 66492688ac7..82cc540e3dd 100644
--- a/templates/libXaw.tmpl
+++ b/templates/libXaw.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXaw'.
 pkgname=libXaw
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xaw6.pc xaw7.pc xaw8.pc"
 short_desc="X Athena Widgets Library from modular Xorg X11"
diff --git a/templates/libXcursor.tmpl b/templates/libXcursor.tmpl
index 9885caf9b88..7aa92de62eb 100644
--- a/templates/libXcursor.tmpl
+++ b/templates/libXcursor.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXcursor'.
 pkgname=libXcursor
-version=1.1.9
 extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xcursor.pc"
 short_desc="Client-side cursor loading library for X"
diff --git a/templates/libXdamage.tmpl b/templates/libXdamage.tmpl
index aa3193d4668..2916458bd19 100644
--- a/templates/libXdamage.tmpl
+++ b/templates/libXdamage.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXdamage'.
 pkgname=libXdamage
 version=1.1.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xdamage.pc"
 short_desc="Xdamage extension (Library)"
diff --git a/templates/libXdmcp.tmpl b/templates/libXdmcp.tmpl
index e333ef70492..639aae53654 100644
--- a/templates/libXdmcp.tmpl
+++ b/templates/libXdmcp.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'libXdmcp'
 pkgname=libXdmcp
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xdmcp.pc"
 short_desc="X Display Manager Control Protocol library from X.org"
diff --git a/templates/libXext.tmpl b/templates/libXext.tmpl
index 374c0062d91..0b8fb3d5cf9 100644
--- a/templates/libXext.tmpl
+++ b/templates/libXext.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXext'.
 pkgname=libXext
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-malloc0returnsnull"
 pkgconfig_override="xext.pc"
diff --git a/templates/libXfixes.tmpl b/templates/libXfixes.tmpl
index 772b7d28453..ab7cdab4083 100644
--- a/templates/libXfixes.tmpl
+++ b/templates/libXfixes.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXfixes'.
 pkgname=libXfixes
 version=4.0.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xfixes.pc"
 short_desc="Xfixes library and extension of X RandR from modular X.org"
diff --git a/templates/libXfont.tmpl b/templates/libXfont.tmpl
index 3a4716fd7ea..582003fd16b 100644
--- a/templates/libXfont.tmpl
+++ b/templates/libXfont.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXfont'.
 pkgname=libXfont
 version=1.3.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xfont.pc"
 short_desc="X font Library"
diff --git a/templates/libXft.tmpl b/templates/libXft.tmpl
index 176dfc14531..8965e2c2e3a 100644
--- a/templates/libXft.tmpl
+++ b/templates/libXft.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXft'.
 pkgname=libXft
 version=2.1.13
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="xft.pc"
diff --git a/templates/libXi.tmpl b/templates/libXi.tmpl
index 93730f6e4ba..59f90137467 100644
--- a/templates/libXi.tmpl
+++ b/templates/libXi.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXi'.
 pkgname=libXi
 version=1.1.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-malloc0returnsnull"
 pkgconfig_override="xi.pc"
diff --git a/templates/libXinerama.tmpl b/templates/libXinerama.tmpl
index c1c2f3fb5a6..64d9d3efb60 100644
--- a/templates/libXinerama.tmpl
+++ b/templates/libXinerama.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXinerama'.
 pkgname=libXinerama
 version=1.0.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-malloc0returnsnull"
 pkgconfig_override="xinerama.pc"
diff --git a/templates/libXmu.tmpl b/templates/libXmu.tmpl
index a2f1ac43562..7bee515edc0 100644
--- a/templates/libXmu.tmpl
+++ b/templates/libXmu.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXmu'.
 pkgname=libXmu
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xmu.pc xmuu.pc"
 short_desc="X Miscellaneous Utilities library"
diff --git a/templates/libXp.tmpl b/templates/libXp.tmpl
index 852f1aae167..589c0cf2b84 100644
--- a/templates/libXp.tmpl
+++ b/templates/libXp.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXp'.
 pkgname=libXp
 version=1.0.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xp.pc"
 short_desc="X Print Service Extension Library"
diff --git a/templates/libXpm.tmpl b/templates/libXpm.tmpl
index 98ff5cabad2..a3dcea34374 100644
--- a/templates/libXpm.tmpl
+++ b/templates/libXpm.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXpm'.
 pkgname=libXpm
 version=3.5.7
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xpm.pc"
 short_desc="X PixMap Library from modular Xorg X11"
diff --git a/templates/libXrandr.tmpl b/templates/libXrandr.tmpl
index 2f818f5d4f3..31792d805d9 100644
--- a/templates/libXrandr.tmpl
+++ b/templates/libXrandr.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXrandr'.
 pkgname=libXrandr
 version=1.2.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-malloc0returnsnull"
 pkgconfig_override="xrandr.pc"
diff --git a/templates/libXrender.tmpl b/templates/libXrender.tmpl
index b64e6672d10..6005be14f7b 100644
--- a/templates/libXrender.tmpl
+++ b/templates/libXrender.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXrender'.
 pkgname=libXrender
 version=0.9.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xrender.pc"
 short_desc="X Render Library"
diff --git a/templates/libXt.tmpl b/templates/libXt.tmpl
index 226a075e497..10077d246fd 100644
--- a/templates/libXt.tmpl
+++ b/templates/libXt.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXt'.
 pkgname=libXt
 version=1.0.5
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-malloc0returnsnull"
 pkgconfig_override="xt.pc"
diff --git a/templates/libXv.tmpl b/templates/libXv.tmpl
index 3eaa7cb28a1..f08ea9705c8 100644
--- a/templates/libXv.tmpl
+++ b/templates/libXv.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXv'.
 pkgname=libXv
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="xv.pc"
diff --git a/templates/libXvMC.tmpl b/templates/libXvMC.tmpl
index a98f339c8a1..46ff99a7423 100644
--- a/templates/libXvMC.tmpl
+++ b/templates/libXvMC.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXvMC'.
 pkgname=libXvMC
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="xvmc.pc"
diff --git a/templates/libXxf86misc.tmpl b/templates/libXxf86misc.tmpl
index fb9ce542838..c09deb6090a 100644
--- a/templates/libXxf86misc.tmpl
+++ b/templates/libXxf86misc.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXxf86misc'.
 pkgname=libXxf86misc
 version=1.0.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xxf86misc.pc"
 short_desc="Library for the XFree86-Misc X extension"
diff --git a/templates/libXxf86vm.tmpl b/templates/libXxf86vm.tmpl
index 4e5a023491c..0e43ed4cb95 100644
--- a/templates/libXxf86vm.tmpl
+++ b/templates/libXxf86vm.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libXxf86vm'.
 pkgname=libXxf86vm
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xxf86vm.pc"
 short_desc="Library for the XFree86-VidMode X extension"
diff --git a/templates/libart.tmpl b/templates/libart.tmpl
index 1537953b7d1..231c90a3a6d 100644
--- a/templates/libart.tmpl
+++ b/templates/libart.tmpl
@@ -1,9 +1,9 @@
 # Template build file for 'libart'.
 pkgname=libart
 version=2.3.20
-distfiles="libart_lgpl-$version"
-extract_sufx=".tar.bz2"
-url=http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3
+wrksrc="libart_lgpl-$version"
+distfiles="
+http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="libart-2.0.pc"
diff --git a/templates/libdrm.tmpl b/templates/libdrm.tmpl
index ef564fd9d65..12ab80eef86 100644
--- a/templates/libdrm.tmpl
+++ b/templates/libdrm.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libdrm'.
 pkgname=libdrm
 version=2.3.1
-extract_sufx=".tar.bz2"
-url=http://dri.freedesktop.org/libdrm
+distfiles="
+http://dri.freedesktop.org/libdrm/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="libdrm.pc"
 short_desc="Userspace interface to kernel DRM services"
diff --git a/templates/libexif.tmpl b/templates/libexif.tmpl
index 3b0e20d6875..3c46de11a32 100644
--- a/templates/libexif.tmpl
+++ b/templates/libexif.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libexif'.
 pkgname=libexif
 version=0.6.16
-extract_sufx=".tar.bz2"
-url=http://kent.dl.sourceforge.net/sourceforge/libexif
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/libexif/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_env="ac_cv_path_DOXYGEN=false"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/libfontenc.tmpl b/templates/libfontenc.tmpl
index 97fbd5f0ff2..4476cf0290c 100644
--- a/templates/libfontenc.tmpl
+++ b/templates/libfontenc.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libfontenc'.
 pkgname=libfontenc
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="fontenc.pc"
 short_desc="The fontenc Library from X.org"
diff --git a/templates/libgcrypt.tmpl b/templates/libgcrypt.tmpl
index 58c4d92efd8..917063e0a93 100644
--- a/templates/libgcrypt.tmpl
+++ b/templates/libgcrypt.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libgcrypt'.
 pkgname=libgcrypt
 version=1.4.3
-extract_sufx=".tar.bz2"
-url=ftp://ftp.gnupg.org/gcrypt/libgcrypt
+distfiles="
+ftp://ftp.gnupg.org/gcrypt/libgcrypt/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="GNU cryptographic library"
diff --git a/templates/libgpg-error.tmpl b/templates/libgpg-error.tmpl
index 8caa999e186..94b24f3902d 100644
--- a/templates/libgpg-error.tmpl
+++ b/templates/libgpg-error.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libgpg-error'.
 pkgname=libgpg-error
 version=1.6
-extract_sufx=".tar.bz2"
-url=ftp://ftp.gnupg.org/gcrypt/libgpg-error
+distfiles="
+ftp://ftp.gnupg.org/gcrypt/libgpg-error/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Definitions of common error values for all GnuPG components"
diff --git a/templates/libidn.tmpl b/templates/libidn.tmpl
index e851c9beb76..a743d6af7da 100644
--- a/templates/libidn.tmpl
+++ b/templates/libidn.tmpl
@@ -1,8 +1,7 @@
 # Template file for 'libidn'
 pkgname=libidn
 version=1.10
-extract_sufx=".tar.gz"
-url=http://ftp.gnu.org/gnu/libidn
+distfiles="http://ftp.gnu.org/gnu/libidn/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 pkgconfig_override="libidn.pc"
 configure_env="EMACS=/bin/false"
diff --git a/templates/libpciaccess.tmpl b/templates/libpciaccess.tmpl
index 1a565fd4d8c..43f0f3d06ac 100644
--- a/templates/libpciaccess.tmpl
+++ b/templates/libpciaccess.tmpl
@@ -2,8 +2,8 @@
 pkgname=libpciaccess
 version=0.10.3
 patch_files="$pkgname-netbsd-support.diff"
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="pciaccess.pc"
diff --git a/templates/libpng.tmpl b/templates/libpng.tmpl
index 511f97a8213..d6382161baa 100644
--- a/templates/libpng.tmpl
+++ b/templates/libpng.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libpng'.
 pkgname=libpng
 version=1.2.32
-extract_sufx=".tar.bz2"
-url=ftp://ftp.fu-berlin.de/unix/graphics/png/src
+distfiles="
+ftp://ftp.fu-berlin.de/unix/graphics/png/src/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="libpng.pc"
diff --git a/templates/libtool.tmpl b/templates/libtool.tmpl
index ec9982b59ab..3edbb9dc4d6 100644
--- a/templates/libtool.tmpl
+++ b/templates/libtool.tmpl
@@ -2,9 +2,9 @@
 pkgname=libtool
 version=2.2.6a
 wrksrc="$pkgname-2.2.6"
-extract_sufx=".tar.gz"
 patch_files="libtool-fix-ltmain.sh.diff"
-url=http://ftp.gnu.org/pub/gnu/libtool
+distfiles="
+http://ftp.gnu.org/pub/gnu/libtool/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 short_desc="Generic library support"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/libungif.tmpl b/templates/libungif.tmpl
index ba3f5ee32a2..dd83785426b 100644
--- a/templates/libungif.tmpl
+++ b/templates/libungif.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libungif'.
 pkgname=libungif
 version=4.1.4
-extract_sufx=".tar.bz2"
-url=http://kent.dl.sourceforge.net/sourceforge/giflib
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/giflib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--without-x"
 configure_env="ac_cv_lib_X11_main=no"
diff --git a/templates/libwmf.tmpl b/templates/libwmf.tmpl
index 9990ad585d3..7d04645e33a 100644
--- a/templates/libwmf.tmpl
+++ b/templates/libwmf.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libwmf'.
 pkgname=libwmf
 version=0.2.8.4
-extract_sufx=".tar.gz"
-url=http://kent.dl.sourceforge.net/sourceforge/wvware
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/wvware/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="
  --with-sysfontmap=$XBPS_MASTERDIR/share/fonts/fontmap
diff --git a/templates/libxkbfile.tmpl b/templates/libxkbfile.tmpl
index 4590c65fd25..b6f1a9cef8e 100644
--- a/templates/libxkbfile.tmpl
+++ b/templates/libxkbfile.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libxkbfile'.
 pkgname=libxkbfile
 version=1.0.5
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xkbfile.pc"
 short_desc="The xkbfile Library from modular X.org"
diff --git a/templates/libxkbui.tmpl b/templates/libxkbui.tmpl
index 14722827778..59fc4eb9ea6 100644
--- a/templates/libxkbui.tmpl
+++ b/templates/libxkbui.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'libxkbui'.
 pkgname=libxkbui
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xkbui.pc"
 short_desc="xkbui library from modular x.org"
diff --git a/templates/libxml2.tmpl b/templates/libxml2.tmpl
index 87d9a4d4080..c015016a54e 100644
--- a/templates/libxml2.tmpl
+++ b/templates/libxml2.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'libxml2'.
 pkgname=libxml2
 version=2.7.2
-extract_sufx=".tar.gz"
-url=http://xmlsoft.org/sources
+distfiles="http://xmlsoft.org/sources/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="libxml-2.0.pc"
diff --git a/templates/libxslt.tmpl b/templates/libxslt.tmpl
index c9fc103802d..9b85c65ccf8 100644
--- a/templates/libxslt.tmpl
+++ b/templates/libxslt.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'libxslt'.
 pkgname=libxslt
 version=1.1.24
-extract_sufx=".tar.gz"
-url=ftp://xmlsoft.org/libxslt
+distfiles="ftp://xmlsoft.org/libxslt/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="libxslt.pc libexslt.pc"
diff --git a/templates/m4.tmpl b/templates/m4.tmpl
index 057ef5788d3..f5e05fa826e 100644
--- a/templates/m4.tmpl
+++ b/templates/m4.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'm4'.
 pkgname=m4
 version=1.4.11
-extract_sufx=".tar.bz2"
-url=http://ftp.gnu.org/gnu/m4
+distfiles="http://ftp.gnu.org/gnu/m4/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="GNU version of UNIX m4 macro language processor"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/mc.tmpl b/templates/mc.tmpl
index b9d0b41c410..1aa879396e7 100644
--- a/templates/mc.tmpl
+++ b/templates/mc.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'mc'
 pkgname=mc
 version=4.6.1
-extract_sufx=".tar.gz"
-url=http://www.ibiblio.org/pub/Linux/utils/file/managers/mc
+distfiles="
+http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 # Override datadir to get the correct directory.
 configure_args="--without-ext2undel --with-screen=mcslang
diff --git a/templates/mkfontdir.tmpl b/templates/mkfontdir.tmpl
index 06eb3cb06fc..f36f72986b1 100644
--- a/templates/mkfontdir.tmpl
+++ b/templates/mkfontdir.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'mkfontdir'.
 pkgname=mkfontdir
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="X11 Font Index Generator"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/mkfontscale.tmpl b/templates/mkfontscale.tmpl
index 05cb952b1ee..7f9548a60f4 100644
--- a/templates/mkfontscale.tmpl
+++ b/templates/mkfontscale.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'mkfontscale'.
 pkgname=mkfontscale
 version=1.0.5
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="X11 Scalable Font Index Generator"
diff --git a/templates/mng.tmpl b/templates/mng.tmpl
index 2d8bfcac6fb..230d0f19003 100644
--- a/templates/mng.tmpl
+++ b/templates/mng.tmpl
@@ -1,9 +1,8 @@
 # Template build file for 'mng'.
 pkgname=mng
 version=1.0.10
-distfiles="libmng-$version"
-extract_sufx=".tar.bz2"
-url=http://www.libmng.com/download
+wrksrc="libmng-$version"
+distfiles="http://www.libmng.com/download/libmng-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Multiple-image Network Graphics (MNG) reference library"
diff --git a/templates/pango.tmpl b/templates/pango.tmpl
index de8e66a14d8..c11eb7d10b8 100644
--- a/templates/pango.tmpl
+++ b/templates/pango.tmpl
@@ -2,8 +2,8 @@
 pkgname=pango
 version=1.22.0
 patch_files="$pkgname-docs-Makefile-in.diff"
-extract_sufx=".tar.bz2"
-url=http://ftp.gnome.org/pub/GNOME/sources/pango/1.22
+distfiles="
+http://ftp.gnome.org/pub/GNOME/sources/pango/1.22/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 pkgconfig_override="pango.pc pangocairo.pc pangoft2.pc pangox.pc pangoxft.pc"
diff --git a/templates/pcre.tmpl b/templates/pcre.tmpl
index c246a74dbb1..c67de691a94 100644
--- a/templates/pcre.tmpl
+++ b/templates/pcre.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'pcre'
 pkgname=pcre
 version=7.8
-extract_sufx=".tar.bz2"
-url=http://kent.dl.sourceforge.net/sourceforge/pcre
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/pcre/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="libpcre.pc libpcrecpp.pc"
 configure_args="--enable-utf8 --enable-unicode-properties"
diff --git a/templates/pekwm.tmpl b/templates/pekwm.tmpl
index edace446523..8ce6d637da3 100644
--- a/templates/pekwm.tmpl
+++ b/templates/pekwm.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'pekwm'.
 pkgname=pekwm
 version=0.1.7
-extract_sufx=".tar.bz2"
-url=http://www.pekwm.org/projects/3/files
+distfiles="
+http://www.pekwm.org/projects/3/files/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Window manager based on aewm++"
diff --git a/templates/perl-XML-Parser.tmpl b/templates/perl-XML-Parser.tmpl
index dfcbf9287af..d703ffdf8a2 100644
--- a/templates/perl-XML-Parser.tmpl
+++ b/templates/perl-XML-Parser.tmpl
@@ -1,9 +1,9 @@
 # Template build file for 'perl-XML-Parser'.
 pkgname=perl-XML-Parser
 version=2.36
-distfiles="XML-Parser-$version"
-extract_sufx=".tar.gz"
-url=http://cpan.perl.org/modules/by-module/XML
+wrksrc="XML-Parser-$version"
+distfiles="
+http://cpan.perl.org/modules/by-module/XML/XML-Parser-$version@.tar.gz"
 build_style=perl_module
 make_build_args="EXPATLIBPATH=$XBPS_MASTERDIR/lib
  EXPATINCPATH=$XBPS_MASTERDIR/include"
diff --git a/templates/perl.tmpl b/templates/perl.tmpl
index bf23d34d2df..85f96a4825e 100644
--- a/templates/perl.tmpl
+++ b/templates/perl.tmpl
@@ -1,9 +1,8 @@
 # Template build file for 'perl'.
 pkgname=perl
 version=5.10.0
-patch_files="perl-dont-hardcode-rpath.diff"
-extract_sufx=".tar.gz"
-url=http://www.cpan.org/src
+patch_files="$pkgname-dont-hardcode-rpath.diff"
+distfiles="http://www.cpan.org/src/$pkgname-$version@.tar.gz"
 configure_script="Configure"
 configure_args="-Dusethreads -des -Dprefix=$XBPS_DESTDIR/$pkgname-$version
  -Ui_malloc -Uusemymalloc -Dinstallstyle=lib/perl5"
diff --git a/templates/pixman.tmpl b/templates/pixman.tmpl
index 997365ceb40..2ff53beb508 100644
--- a/templates/pixman.tmpl
+++ b/templates/pixman.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'pixman'.
 pkgname=pixman
 version=0.12.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="pixman-1.pc"
 short_desc="Library of low-level pixel manipulation routines"
diff --git a/templates/pkg-config.tmpl b/templates/pkg-config.tmpl
index e6bd17dd33d..27e45e3347e 100644
--- a/templates/pkg-config.tmpl
+++ b/templates/pkg-config.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'pkg-config'
 pkgname=pkg-config
 version=0.23
-extract_sufx=".tar.gz"
-url=http://pkgconfig.freedesktop.org/releases
+distfiles="
+http://pkgconfig.freedesktop.org/releases/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--with-pc-path=$XBPS_MASTERDIR/lib/pkgconfig"
 short_desc="System for managing library compile/link flags"
diff --git a/templates/poppler.tmpl b/templates/poppler.tmpl
index 968350a864a..13ad4e25a86 100644
--- a/templates/poppler.tmpl
+++ b/templates/poppler.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'poppler'.
 pkgname=poppler
 version=0.10.0
-extract_sufx=".tar.gz"
-url=http://poppler.freedesktop.org
+distfiles="
+http://poppler.freedesktop.org/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 configure_args="--enable-zlib --disable-poppler-qt --disable-poppler-qt4
diff --git a/templates/printproto.tmpl b/templates/printproto.tmpl
index 4ada592cb0c..9ed1941e470 100644
--- a/templates/printproto.tmpl
+++ b/templates/printproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'printproto'.
 pkgname=printproto
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="printproto.pc"
 short_desc="Print extension headers from X.org"
diff --git a/templates/python.tmpl b/templates/python.tmpl
index 46d2df2bca8..e51a76edb90 100644
--- a/templates/python.tmpl
+++ b/templates/python.tmpl
@@ -1,11 +1,11 @@
 # Template build file for 'python'
 pkgname=python
 version=2.5.2
-distfiles="Python-$version"
-extract_sufx=".tar.bz2"
+wrksrc="Python-$version"
 patch_files="python-fix-build.diff python-fix-curses-module.diff 
  python-fix-bluetooth.diff python-fix-mremap.diff"
-url=http://www.python.org/ftp/python/$version
+distfiles="
+http://www.python.org/ftp/python/$version/Python-$version@.tar.bz2"
 configure_args="--with-threads --enable-shared"
 build_style=gnu_configure
 short_desc="Interpreted, interactive, object-oriented programming language"
diff --git a/templates/randrproto.tmpl b/templates/randrproto.tmpl
index 70028819d8d..733254b6d5b 100644
--- a/templates/randrproto.tmpl
+++ b/templates/randrproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'randrproto'.
 pkgname=randrproto
 version=1.2.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="randrproto.pc"
 short_desc="Randr extension headers from modular X.org"
diff --git a/templates/recordproto.tmpl b/templates/recordproto.tmpl
index fe0c10d9834..ed392f9bb6c 100644
--- a/templates/recordproto.tmpl
+++ b/templates/recordproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'recordproto'.
 pkgname=recordproto
 version=1.13.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="recordproto.pc"
 short_desc="Record extension headers from X.org"
diff --git a/templates/renderproto.tmpl b/templates/renderproto.tmpl
index 732fb8f634d..77b7444e077 100644
--- a/templates/renderproto.tmpl
+++ b/templates/renderproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'renderproto'.
 pkgname=renderproto
 version=0.9.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="renderproto.pc"
 short_desc="Render extension headers from modular X.org"
diff --git a/templates/resourceproto.tmpl b/templates/resourceproto.tmpl
index a2f434fc423..cebcd4d6500 100644
--- a/templates/resourceproto.tmpl
+++ b/templates/resourceproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'resourceproto'.
 pkgname=resourceproto
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="resourceproto.pc"
 short_desc="Resource extension headers from X.org"
diff --git a/templates/ruby.tmpl b/templates/ruby.tmpl
index cee0f93c14a..1a9f3fb57b1 100644
--- a/templates/ruby.tmpl
+++ b/templates/ruby.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'ruby'.
 pkgname=ruby
 version=1.8.7-p72
-extract_sufx=".tar.bz2"
-url=ftp://ftp.ruby-lang.org/pub/ruby/1.8
+distfiles="
+ftp://ftp.ruby-lang.org/pub/ruby/1.8/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 # Override --exec-prefix to install it into the correct location.
 configure_args="--enable-pthread --enable-shared
diff --git a/templates/scrnsaverproto.tmpl b/templates/scrnsaverproto.tmpl
index e3dd74111ce..08480f32c5b 100644
--- a/templates/scrnsaverproto.tmpl
+++ b/templates/scrnsaverproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'scrnsaverproto'.
 pkgname=scrnsaverproto
 version=1.1.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="scrnsaverproto.pc"
 short_desc="ScrnSaver extension headers from X.org"
diff --git a/templates/shared-mime-info.tmpl b/templates/shared-mime-info.tmpl
index 1d3baa97707..9c4979b468a 100644
--- a/templates/shared-mime-info.tmpl
+++ b/templates/shared-mime-info.tmpl
@@ -2,8 +2,8 @@
 pkgname=shared-mime-info
 version=0.51
 patch_files="$pkgname-fix-pkgconfig.diff"
-extract_sufx=".tar.bz2"
-url=http://people.freedesktop.org/~hadess
+distfiles="
+http://people.freedesktop.org/~hadess/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-update-mimedb"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/sqlite.tmpl b/templates/sqlite.tmpl
index 5c50a36fa6d..9ca2628ad98 100644
--- a/templates/sqlite.tmpl
+++ b/templates/sqlite.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'sqlite'.
 pkgname=sqlite
 version=3.6.3
-extract_sufx=".tar.gz"
-url=http://sqlite.org
+distfiles="http://sqlite.org/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-tcl --enable-load-extension --with-readline-inc="
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/sudo.tmpl b/templates/sudo.tmpl
index 7b6658fc46f..2c2857825ba 100644
--- a/templates/sudo.tmpl
+++ b/templates/sudo.tmpl
@@ -2,8 +2,7 @@
 pkgname=sudo
 version=1.6.9p17
 patch_files="$pkgname-Makefile-in.diff"
-extract_sufx=".tar.gz"
-url=http://www.courtesan.com/sudo/dist
+distfiles="http://www.courtesan.com/sudo/dist/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--disable-root-mailer"
 short_desc="Allow others to run commands as root"
diff --git a/templates/sylpheed.tmpl b/templates/sylpheed.tmpl
index 11b398d7ced..f74d0a20f7e 100644
--- a/templates/sylpheed.tmpl
+++ b/templates/sylpheed.tmpl
@@ -2,8 +2,8 @@
 pkgname=sylpheed
 version=2.6.0beta1
 patch_files="$pkgname-fix-latest-gtk.diff"
-extract_sufx=".tar.bz2"
-url=http://sylpheed.sraoss.jp/sylpheed/v2.6beta
+distfiles="
+http://sylpheed.sraoss.jp/sylpheed/v2.6beta/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-compface --disable-gtkspell
  --disable-gpgme"
diff --git a/templates/tiff.tmpl b/templates/tiff.tmpl
index 10a8d0ccbf4..bcfe12cd748 100644
--- a/templates/tiff.tmpl
+++ b/templates/tiff.tmpl
@@ -1,8 +1,7 @@
 # Template build file for 'tiff'.
 pkgname=tiff
 version=3.8.2
-extract_sufx=".tar.gz"
-url=http://libtiff.maptools.org/dl
+distfiles="http://libtiff.maptools.org/dl/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 configure_args="--enable-rpath --enable-cxx --without-x"
 short_desc="Library and tools for reading and writing TIFF data files"
diff --git a/templates/trapproto.tmpl b/templates/trapproto.tmpl
index 9aa6c4988f5..f622a139c50 100644
--- a/templates/trapproto.tmpl
+++ b/templates/trapproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'trapproto'.
 pkgname=trapproto
 version=3.4.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="trapproto.pc"
 short_desc="Trap extension headers"
diff --git a/templates/unzip.tmpl b/templates/unzip.tmpl
index 372668e4f03..37f6024c562 100644
--- a/templates/unzip.tmpl
+++ b/templates/unzip.tmpl
@@ -3,9 +3,8 @@ pkgname=unzip
 version=5.52
 wrksrc=$pkgname-$version
 patch_files=$pkgname-fix-unzipsfx.diff
-distfiles=unzip552
-extract_sufx=".tgz"
-url=ftp://ftp.info-zip.org/pub/infozip/src/
+distfiles="
+ftp://ftp.info-zip.org/pub/infozip/src/unzip552@.tgz"
 build_style=gnu_makefile
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 CFLAGS="-I. -DUNIX -Dunix -DUSE_UNSHRINK"
diff --git a/templates/util-macros.tmpl b/templates/util-macros.tmpl
index ae923714040..7b2fd35b401 100644
--- a/templates/util-macros.tmpl
+++ b/templates/util-macros.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'util-macros'.
 pkgname=util-macros
 version=1.1.6
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/util
+distfiles="
+http://xorg.freedesktop.org/releases/individual/util/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Xorg autotool macros"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/videoproto.tmpl b/templates/videoproto.tmpl
index b61c06b6457..e9b677af3b4 100644
--- a/templates/videoproto.tmpl
+++ b/templates/videoproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'videoproto'.
 pkgname=videoproto
 version=2.2.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="videoproto.pc"
 short_desc="Video extension headers from modular X.org X11"
diff --git a/templates/vim.tmpl b/templates/vim.tmpl
index 89352fbf5dd..d026899f7c7 100644
--- a/templates/vim.tmpl
+++ b/templates/vim.tmpl
@@ -2,8 +2,7 @@
 pkgname=vim
 version=7.2
 wrksrc=vim72
-extract_sufx=".tar.bz2"
-url=ftp://ftp.vim.org/pub/vim/unix
+distfiles="ftp://ftp.vim.org/pub/vim/unix/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Vim editor (vi clone)"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/xauth.tmpl b/templates/xauth.tmpl
index 871d61e81c9..a7b18a1e73b 100644
--- a/templates/xauth.tmpl
+++ b/templates/xauth.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xauth'.
 pkgname=xauth
 version=1.0.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="X authentication utility"
diff --git a/templates/xcmiscproto.tmpl b/templates/xcmiscproto.tmpl
index b0d8d4215c5..03126095a34 100644
--- a/templates/xcmiscproto.tmpl
+++ b/templates/xcmiscproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'xcmiscproto'.
 pkgname=xcmiscproto
 version=1.1.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="XCMisc extension headers from X.org"
 pkgconfig_override="xcmiscproto.pc"
diff --git a/templates/xextproto.tmpl b/templates/xextproto.tmpl
index 0942a834796..38be2c959e4 100644
--- a/templates/xextproto.tmpl
+++ b/templates/xextproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'xextproto'
 pkgname=xextproto
 version=7.0.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xextproto.pc"
 short_desc="XExt extension headers from X.org"
diff --git a/templates/xf86-input-joystick.tmpl b/templates/xf86-input-joystick.tmpl
index 8d1c6c1c726..2aca40ad700 100644
--- a/templates/xf86-input-joystick.tmpl
+++ b/templates/xf86-input-joystick.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-input-joystick'.
 pkgname=xf86-input-joystick
 version=1.3.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Joystick Input driver for Modular X.org"
diff --git a/templates/xf86-input-keyboard.tmpl b/templates/xf86-input-keyboard.tmpl
index e232da7bd5c..be3117054c8 100644
--- a/templates/xf86-input-keyboard.tmpl
+++ b/templates/xf86-input-keyboard.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-input-keyboard'.
 pkgname=xf86-input-keyboard
 version=1.3.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Modular Xorg keyboard driver"
diff --git a/templates/xf86-input-mouse.tmpl b/templates/xf86-input-mouse.tmpl
index 1f941526490..56fa28d6c17 100644
--- a/templates/xf86-input-mouse.tmpl
+++ b/templates/xf86-input-mouse.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-input-mouse'.
 pkgname=xf86-input-mouse
 version=1.3.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Modular Xorg mouse driver"
diff --git a/templates/xf86-input-vmmouse.tmpl b/templates/xf86-input-vmmouse.tmpl
index 507630b1e02..9c8dbcd8966 100644
--- a/templates/xf86-input-vmmouse.tmpl
+++ b/templates/xf86-input-vmmouse.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-input-vmmouse'.
 pkgname=xf86-input-vmmouse
 version=12.5.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Modular Xorg VMware virtual mouse driver"
diff --git a/templates/xf86-video-ati.tmpl b/templates/xf86-video-ati.tmpl
index 4754415e7f7..2d500725fa4 100644
--- a/templates/xf86-video-ati.tmpl
+++ b/templates/xf86-video-ati.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-video-ati'.
 pkgname=xf86-video-ati
 version=6.9.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-dri"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/xf86-video-intel.tmpl b/templates/xf86-video-intel.tmpl
index 14c6db17faf..195e54dc5f4 100644
--- a/templates/xf86-video-intel.tmpl
+++ b/templates/xf86-video-intel.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-video-intel'.
 pkgname=xf86-video-intel
 version=2.4.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-dri"
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
diff --git a/templates/xf86-video-radeonhd.tmpl b/templates/xf86-video-radeonhd.tmpl
index 0b21b3e2c8e..ac48a6eb850 100644
--- a/templates/xf86-video-radeonhd.tmpl
+++ b/templates/xf86-video-radeonhd.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-video-radeonhd'.
 pkgname=xf86-video-radeonhd
 version=1.2.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Modular X.org driver for Radeon HD series"
diff --git a/templates/xf86-video-vmware.tmpl b/templates/xf86-video-vmware.tmpl
index 2a97a9e6ca0..c7eda8973aa 100644
--- a/templates/xf86-video-vmware.tmpl
+++ b/templates/xf86-video-vmware.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86-video-vmware'.
 pkgname=xf86-video-vmware
 version=10.16.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/driver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/driver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Modular Xorg VMware virtual video driver"
diff --git a/templates/xf86bigfontproto.tmpl b/templates/xf86bigfontproto.tmpl
index f558b8b4f91..688b9ad3471 100644
--- a/templates/xf86bigfontproto.tmpl
+++ b/templates/xf86bigfontproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'xf86bigfontproto'
 pkgname=xf86bigfontproto
 version=1.1.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xf86bigfontproto.pc"
 short_desc="XF86BigFont extension headers from X.org"
diff --git a/templates/xf86dgaproto.tmpl b/templates/xf86dgaproto.tmpl
index dce95d36010..a1280250202 100644
--- a/templates/xf86dgaproto.tmpl
+++ b/templates/xf86dgaproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86dgaproto'.
 pkgname=xf86dgaproto
 version=2.0.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xf86dgaproto.pc"
 short_desc="XF86DGA extension headers"
diff --git a/templates/xf86driproto.tmpl b/templates/xf86driproto.tmpl
index c64ccc270a0..52242113aac 100644
--- a/templates/xf86driproto.tmpl
+++ b/templates/xf86driproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86driproto'.
 pkgname=xf86driproto
 version=2.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xf86driproto.pc"
 short_desc="XF86DRI extension headers from modular X.org"
diff --git a/templates/xf86miscproto.tmpl b/templates/xf86miscproto.tmpl
index 25626573b96..cf413d7f0ab 100644
--- a/templates/xf86miscproto.tmpl
+++ b/templates/xf86miscproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86miscproto'.
 pkgname=xf86miscproto
 version=0.9.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xf86miscproto.pc"
 short_desc="XF86Misc extension headers from modular X.org"
diff --git a/templates/xf86vidmodeproto.tmpl b/templates/xf86vidmodeproto.tmpl
index f7fb27065a7..29e2966bc2a 100644
--- a/templates/xf86vidmodeproto.tmpl
+++ b/templates/xf86vidmodeproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xf86vidmodeproto'.
 pkgname=xf86vidmodeproto
 version=2.2.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xf86vidmodeproto.pc"
 short_desc="XF86VidMode extension headers from modular X.org"
diff --git a/templates/xineramaproto.tmpl b/templates/xineramaproto.tmpl
index add1e06c561..deef36f9ea6 100644
--- a/templates/xineramaproto.tmpl
+++ b/templates/xineramaproto.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xineramaproto'.
 pkgname=xineramaproto
 version=1.1.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xineramaproto.pc"
 short_desc="Xinerama extension headers from X.org"
diff --git a/templates/xinit.tmpl b/templates/xinit.tmpl
index 5e8b836e42a..d5b038d8eb8 100644
--- a/templates/xinit.tmpl
+++ b/templates/xinit.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xinit'.
 pkgname=xinit
 version=1.1.0
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="X init program"
diff --git a/templates/xkbcomp.tmpl b/templates/xkbcomp.tmpl
index 532bae2b7e4..8063a99e945 100644
--- a/templates/xkbcomp.tmpl
+++ b/templates/xkbcomp.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xkbcomp'.
 pkgname=xkbcomp
 version=1.0.5
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="XKBD keymap compiler"
 checksum=09af0ab2c714066846ede7317564b658623d3c9e
diff --git a/templates/xkeyboard-config.tmpl b/templates/xkeyboard-config.tmpl
index a7b2c5bf187..0ace5a03f4c 100644
--- a/templates/xkeyboard-config.tmpl
+++ b/templates/xkeyboard-config.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xkeyboard-config'.
 pkgname=xkeyboard-config
 version=1.4
-extract_sufx=".tar.bz2"
-url=http://xlibs.freedesktop.org/xkbdesc
+distfiles="
+http://xlibs.freedesktop.org/xkbdesc/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-xkb-rules-symlink=xfree86,xorg
  --enable-compat-rules"
diff --git a/templates/xmlcatmgr.tmpl b/templates/xmlcatmgr.tmpl
index cf1b8c747e8..cae2f784c93 100644
--- a/templates/xmlcatmgr.tmpl
+++ b/templates/xmlcatmgr.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xmlcatmgr'.
 pkgname=xmlcatmgr
 version=2.2
-extract_sufx=".tar.gz"
-url=http://kent.dl.sourceforge.net/sourceforge/xmlcatmgr
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/xmlcatmgr/$pkgname-$version@.tar.gz"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="XML and SGML catalog manager"
diff --git a/templates/xorg-server.tmpl b/templates/xorg-server.tmpl
index c9369281516..65cc8ce8d07 100644
--- a/templates/xorg-server.tmpl
+++ b/templates/xorg-server.tmpl
@@ -2,8 +2,8 @@
 pkgname=xorg-server
 version=1.5.1
 patch_files="$pkgname-dix-getevents-c.diff"
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/xserver
+distfiles="
+http://xorg.freedesktop.org/releases/individual/xserver/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 configure_args="--with-xkb-path=$XBPS_MASTERDIR/share/X11/xkb
  --with-xkb-output=$XBPS_MASTERDIR/var/db/xkb --enable-install-setuid
diff --git a/templates/xprop.tmpl b/templates/xprop.tmpl
index 380c313b7d3..a781238be39 100644
--- a/templates/xprop.tmpl
+++ b/templates/xprop.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xprop'.
 pkgname=xprop
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="Property displayer for X"
diff --git a/templates/xproto.tmpl b/templates/xproto.tmpl
index 7442f2ddc8a..bf0d35e7ecc 100644
--- a/templates/xproto.tmpl
+++ b/templates/xproto.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'xproto'
 pkgname=xproto
 version=7.0.13
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/proto
+distfiles="
+http://xorg.freedesktop.org/releases/individual/proto/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="X protocol and ancillary headers from Xorg X11"
 pkgconfig_override="xproto.pc"
diff --git a/templates/xrandr.tmpl b/templates/xrandr.tmpl
index 83c68cb7fa2..aeccf0d4284 100644
--- a/templates/xrandr.tmpl
+++ b/templates/xrandr.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xrandr'.
 pkgname=xrandr
 version=1.2.3
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Primitive command line interface to RandR extension"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/xset.tmpl b/templates/xset.tmpl
index 7083f5a4eea..353e43c26b7 100644
--- a/templates/xset.tmpl
+++ b/templates/xset.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xset'.
 pkgname=xset
 version=1.0.4
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="X11 user preferences utility"
diff --git a/templates/xsetroot.tmpl b/templates/xsetroot.tmpl
index 452b90f125b..07e7fb41aa4 100644
--- a/templates/xsetroot.tmpl
+++ b/templates/xsetroot.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xsetroot'.
 pkgname=xsetroot
 version=1.0.2
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/app
+distfiles="
+http://xorg.freedesktop.org/releases/individual/app/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 make_cmd="$XBPS_MASTERDIR/bin/gmake"
 short_desc="X root window parameter setting program"
diff --git a/templates/xstow.tmpl b/templates/xstow.tmpl
index 1f05651221f..f13d2b70ce9 100644
--- a/templates/xstow.tmpl
+++ b/templates/xstow.tmpl
@@ -1,8 +1,8 @@
 # Template build file for 'xstow'.
 pkgname=xstow
 version=0.6.1-unstable
-extract_sufx=".tar.bz2"
-url=http://kent.dl.sourceforge.net/sourceforge/xstow
+distfiles="
+http://kent.dl.sourceforge.net/sourceforge/xstow/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 short_desc="Replacement of GNU Stow written in C++"
 maintainer="Juan RP <xtraeme@gmail.com>"
diff --git a/templates/xterm.tmpl b/templates/xterm.tmpl
index ca009c0dd0e..fe6b18167a0 100644
--- a/templates/xterm.tmpl
+++ b/templates/xterm.tmpl
@@ -2,9 +2,7 @@
 pkgname=xterm
 version=2.37
 wrksrc=$pkgname-237
-distfiles="$pkgname-237"
-extract_sufx=".tgz"
-url=ftp://invisible-island.net/xterm
+distfiles="ftp://invisible-island.net/xterm/$pkgname-237@.tgz"
 build_style=gnu_configure
 configure_args="--enable-wide-chars --enable-88-color
  --enable-256-color --enable-luit --enable-paste64
diff --git a/templates/xtrans.tmpl b/templates/xtrans.tmpl
index b2522c204ce..45e6b6647f2 100644
--- a/templates/xtrans.tmpl
+++ b/templates/xtrans.tmpl
@@ -1,8 +1,8 @@
 # Template file for 'xtrans'
 pkgname=xtrans
 version=1.2.1
-extract_sufx=".tar.bz2"
-url=http://xorg.freedesktop.org/releases/individual/lib
+distfiles="
+http://xorg.freedesktop.org/releases/individual/lib/$pkgname-$version@.tar.bz2"
 build_style=gnu_configure
 pkgconfig_override="xtrans.pc"
 short_desc="Network API translation layer to insulate X"
diff --git a/templates/zip.tmpl b/templates/zip.tmpl
index 03abf536353..4e2b8e53c11 100644
--- a/templates/zip.tmpl
+++ b/templates/zip.tmpl
@@ -1,9 +1,7 @@
 # Template build file for 'zip'.
 pkgname=zip
 version=2.32
-distfiles="zip232"
-extract_sufx=".tgz"
-url=ftp://ftp.info-zip.org/pub/infozip/src
+distfiles="ftp://ftp.info-zip.org/pub/infozip/src/zip232@.tgz"
 build_style=bsd_makefile
 make_build_args="-f unix/Makefile"
 make_build_target="generic_gcc"
diff --git a/xbps.sh b/xbps.sh
index 58b259b86bc..b9fd80e0462 100755
--- a/xbps.sh
+++ b/xbps.sh
@@ -31,9 +31,9 @@
 #	- Implement support for packages that need personalized installation.
 #	- Implement a chroot target that builds packages as root on it, for
 #	  packages that need it (setuid, setgid).
-#	- More robust and fast dependency checking.
-# 	- Multiple distfiles in a package, personalized stuff to unpack them.
+#	- Personalized scripts per template to unpack distfiles.
 #	- Multiple URLs to download source distribution files, aliases, etc.
+#	- More robust and fast dependency checking.
 #
 # Default path to configuration file, can be overriden
 # via the environment or command line.
@@ -247,11 +247,11 @@ check_config_vars()
 #
 reset_tmpl_vars()
 {
-	local TMPL_VARS="pkgname extract_sufx distfiles url configure_args \
+	local TMPL_VARS="pkgname distfiles configure_args configure_env \
 			make_build_args make_install_args build_style	\
 			short_desc maintainer long_desc checksum wrksrc	\
-			patch_files configure_env make_cmd pkgconfig_override \
-			configure_env make_env make_build_target \
+			patch_files make_cmd pkgconfig_override \
+			make_env make_build_target configure_script \
 			run_stuff_before_configure_cmd run_stuff_before_build_cmd \
 			run_stuff_before_install_cmd run_stuff_after_install_cmd \
 			make_install_target postinstall_helpers version \
@@ -289,70 +289,28 @@ setup_tmpl()
 #
 prepare_tmpl()
 {
-	local dfile=""
-
 	#
 	# There's nothing of interest if we are a meta template.
 	#
 	[ "$build_style" = "meta-template" ] && return 0
 
-	REQ_VARS="pkgname version extract_sufx url build_style"
+	REQ_VARS="pkgname distfiles version build_style"
 
 	# Check if required vars weren't set.
 	for i in ${REQ_VARS}; do
 		eval val="\$$i"
 		if [ -z "$val" -o -z "$i" ]; then
-			echo -n "*** ERROR: $i not set (incomplete template"
-			echo	" build file), aborting ***"
+			echo -n	"*** ERROR: \"$i\" not set on \`$pkgname' "
+			echo	"template ***"
 			exit 1
 		fi
 	done
 
-	if [ -z "$distfiles" ]; then
-		dfile="$pkgname-$version$extract_sufx"
-	elif [ -n "${distfiles}" ]; then
-		dfile="$distfiles$extract_sufx"
-	else
-		echo "*** ERROR unsupported fetch state ***"
-		exit 1
-	fi
-
-	dfile="$XBPS_SRCDISTDIR/$dfile"
-
-	case "$extract_sufx" in
-	.tar.bz2|.tar.gz|.tgz|.tbz)
-		extract_cmd="$tar_cmd xfz $dfile -C $XBPS_BUILDDIR"
-		;;
-	.tar)
-		extract_cmd="$tar_cmd xf $dfile -C $XBPS_BUILDDIR"
-		;;
-	.zip)
-		if [ -f "$XBPS_TMPLHELPDIR/unzip-extraction.sh" ]; then
-			. $XBPS_TMPLHELPDIR/unzip-extraction.sh
-			unset wrksrc
-		fi
-		# $extract_cmd set by the helper
-		;;
-	*)
-		echo -n "*** ERROR: unknown 'extract_sufx' argument in build "
-		echo	"file ***"
-		exit 1
-		;;
-	esac
-
 	unset XBPS_EXTRACT_DONE XBPS_APPLYPATCHES_DONE
 	unset XBPS_CONFIGURE_DONE XBPS_BUILD_DONE XBPS_INSTALL_DONE
 
-	if [ -n "$wrksrc" ]; then
-		wrksrc=$XBPS_BUILDDIR/$wrksrc
-	elif [ -z "$wrksrc" -a -z "$distfiles" ]; then
-		wrksrc=$XBPS_BUILDDIR/$pkgname-$version
-	elif [ -z "$wrksrc" -a -n "$distfiles" ]; then
-		wrksrc=$XBPS_BUILDDIR/$distfiles
-	else
-		echo "*** ERROR: can't guess what's the correct \$wrksrc! ***"
-		exit 1
-	fi
+	[ -z "$wrksrc" ] && wrksrc="$pkgname-$version"
+	wrksrc="$XBPS_BUILDDIR/$wrksrc"
 
 	XBPS_EXTRACT_DONE="$wrksrc/.xbps_extract_done"
 	XBPS_APPLYPATCHES_DONE="$wrksrc/.xbps_applypatches_done"
@@ -365,11 +323,15 @@ prepare_tmpl()
 
 #
 # Extracts contents of distfiles specified in a template into
-# the build directory.
+# the $wrksrc directory.
 #
 extract_distfiles()
 {
 	local pkg="$1"
+	local count=
+	local curfile=
+	local cursufx=
+	local lwrksrc=
 
 	#
 	# If we are being called via the target, just extract and return.
@@ -381,68 +343,115 @@ extract_distfiles()
 	#
 	[ "$build_style" = "meta-template" ] && return 0
 
-	echo "==> Extracting \`$pkgname-$version' into $XBPS_BUILDDIR."
+	for f in ${distfiles}; do
+		count=$(($count + 1))
+	done
 
-	$extract_cmd
-	if [ "$?" -ne 0 ]; then
-		echo -n "*** ERROR: there was an error extracting the "
-		echo "distfile(s), aborting *** "
-		exit 1
+	if [ $count -gt 1 ]; then
+		if [ -z "$wrksrc" ]; then
+			echo -n "*** ERROR: \$wrksrc must be defined with "
+			echo "multiple distfiles ***"
+			exit 1
+		fi
+		$mkdir_cmd $wrksrc
 	fi
 
-	unset extract_cmd
+	echo "==> Extracting '$pkgname-$version' distfiles."
+
+	for f in ${distfiles}; do
+		curfile=$(basename $f)
+		cursufx=${curfile##*@}
+		curfile=$(basename $curfile|$sed_cmd 's|@||g')
+
+		if [ $count -gt 1 ]; then
+			lwrksrc="$wrksrc/${curfile%$cursufx}"
+		else
+			lwrksrc="$XBPS_BUILDDIR"
+		fi
+
+		case ${cursufx} in
+		.tar.bz2|.tar.gz|.tgz|.tbz)
+			$tar_cmd xfz $XBPS_SRCDISTDIR/$curfile -C $lwrksrc
+			if [ $? -ne 0 ]; then
+				echo -n "*** ERROR extracting \`$curfile' into "
+				echo	"$lwrksrc ***"
+				exit 1
+			fi
+			;;
+		.tar)
+			$tar_cmd xf $XBPS_SRCDISTDIR/$curfile -C $lwrksrc
+			if [ $? -ne 0 ]; then
+				echo -n "*** ERROR extracting \`$curfile' into "
+				echo	"$lwrksrc ***"
+				exit 1
+			fi
+			;;
+		.zip)
+			if [ -f "$XBPS_TMPLHELPDIR/unzip-extraction.sh" ]; then
+				# Save vars!
+				tmpf=$curfile
+				tmpsufx=$cursufx
+				tmpwrksrc=$lwrksrc
+				. $XBPS_TMPLHELPDIR/unzip-extraction.sh
+				# Restore vars!
+				curfile=$tmpf
+				cursufx=$tmpsufx
+				lwrksrc=$tmpwrksrc
+				unset tmpf tmpsufx tmpwrksrc
+			else
+				echo "*** ERROR: cannot find unzip helper ***"
+				exit 1
+			fi
+
+			extract_unzip $XBPS_SRCDISTDIR/$curfile $lwrksrc
+			if [ $? -ne 0 ]; then
+				echo -n "*** ERROR extracting \`$curfile' into "
+				echo	"$lwrksrc ***"
+				exit 1
+			fi
+			;;
+		*)
+			echo -n "*** ERROR: cannot guess \`$curfile' extract "
+			echo	"suffix ***"
+			exit 1
+			;;
+		esac
+	done
+
 	$touch_cmd -f $XBPS_EXTRACT_DONE
 }
 
 #
-# Verifies that a checksum of a distfile is correct.
+# Verifies that file's checksum downloaded matches what it's specified
+# in template file.
 #
-check_rmd160_cksum()
+verify_rmd160_cksum()
 {
 	local file="$1"
-	local dfile=
+	local origsum="$2"
 
-	[ -z "$file" ] && return 1
+	[ -z "$file" -o -z "$cksum" ] && return 1
 
-	if [ -z "${distfiles}" ]; then
-		dfile="$pkgname-$version$extract_sufx"
-	elif [ -n "${distfiles}" ]; then
-		dfile="$distfiles$extract_sufx"
-	else
-		dfile="$file$extract_sufx"
-	fi
-
-	if [ -z "$checksum" ]; then
-		echo "*** ERROR: checksum unset in template file for \`$pkgname' ***"
-		exit 1
-	fi
-
-	origsum="$checksum"
-	dfile="$XBPS_SRCDISTDIR/$dfile"
-	filesum="$($cksum_cmd $dfile | $awk_cmd '{print $4}')"
+	filesum="$($cksum_cmd $XBPS_SRCDISTDIR/$file | $awk_cmd '{print $4}')"
 	if [ "$origsum" != "$filesum" ]; then
-		echo "*** WARNING: RMD160 checksum doesn't match for \`$dfile' ***"
+		echo "*** ERROR: RMD160 checksum doesn't match for \`$file' ***"
 		exit 1
 	fi
 
-	echo "=> checksum (RMD160) OK for \`$pkgname-$version'."
+	echo "=> checksum (RMD160) OK for \`$file'."
 }
 
 #
-# Downloads the distfiles for a template from $url.
+# Downloads the distfiles and verifies checksum for all them.
 #
 fetch_distfiles()
 {
 	local pkg="$1"
-	local file=""
-	local file2=""
-	local only_fetch=
+	local dfiles=
+	local localurl=
+	local dfcount=0
+	local ckcount=0
 
-	#
-	# If we are being called by the target, just fetch distfiles
-	# and return.
-	#
-	[ -n $pkg ] && only_fetch=yes
 	[ -z $pkgname ] && exit 1
 
 	#
@@ -450,35 +459,88 @@ fetch_distfiles()
 	#
 	[ "$build_style" = "meta-template" ] && return 0
 
-	if [ -z "$distfiles" ]; then
-		file="$pkgname-$version"
-	else
-		file="$distfiles"
-	fi
+	dfiles=$(echo $distfiles | $sed_cmd 's|@||g')
 
-	for f in "$file"; do
-		file2="$f$extract_sufx"
-		if [ -f "$XBPS_SRCDISTDIR/$file2" ]; then
-			check_rmd160_cksum $f
-			[ $? -eq 0 ] && continue
+	for f in ${dfiles}; do
+		curfile=$(basename $f)
+		if [ -f "$XBPS_SRCDISTDIR/$curfile" ]; then
+			for i in ${checksum}; do
+				if [ $dfcount -eq $ckcount -a -n $i ]; then
+					cksum=$i
+					found=yes
+					break
+				fi
+
+				ckcount=$(($ckcount + 1))
+			done
+
+			if [ -z $found ]; then
+				echo -n "*** ERROR: cannot find checksum for "
+				echo	"$curfile ***"
+				exit 1
+			fi
+
+			verify_rmd160_cksum $curfile $cksum
+			if [ $? -eq 0 ]; then
+				unset cksum found
+				ckcount=0
+				dfcount=$(($dfcount + 1))
+				continue
+			fi
 		fi
 
-		echo "==> Fetching distfile: \`$file2'."
+		echo "==> Fetching distfile: \`$curfile'."
 
-		cd $XBPS_SRCDISTDIR && $fetch_cmd $url/$file2
+		if [ -n "$distfiles" ]; then
+			localurl="$f"
+		else
+			localurl="$url/$curfile"
+		fi
+
+
+		cd $XBPS_SRCDISTDIR && $fetch_cmd $localurl
 		if [ $? -ne 0 ]; then
-			if [ ! -f $XBPS_SRCDISTDIR/$file2 ]; then
-				echo -n "*** ERROR: couldn't fetch '$file2', "
+			unset localurl
+			if [ ! -f $XBPS_SRCDISTDIR/$curfile ]; then
+				echo -n "*** ERROR: couldn't fetch '$curfile', "
 				echo	"aborting ***"
 			else
 				echo -n "*** ERROR: there was an error "
-				echo	"fetching '$file2', aborting ***"
+				echo	"fetching '$curfile', aborting ***"
 			fi
 			exit 1
 		else
-			check_rmd160_cksum $f
+			unset localurl
+			#
+			# XXX duplicate code.
+			#
+			for i in ${checksum}; do
+				if [ $dfcount -eq $ckcount -a -n $i ]; then
+					cksum=$i
+					found=yes
+					break
+				fi
+
+				ckcount=$(($ckcount + 1))
+			done
+
+			if [ -z $found ]; then
+				echo -n "*** ERROR: cannot find checksum for "
+				echo "$curfile ***"
+				exit 1
+			fi
+
+			verify_rmd160_cksum $curfile $cksum
+			if [ $? -eq 0 ]; then
+				unset cksum found
+				ckcount=0
+			fi
 		fi
+
+		dfcount=$(($dfcount + 1))
 	done
+
+	unset cksum found
 }
 
 fixup_tmpl_libtool()
@@ -558,8 +620,8 @@ apply_tmpl_patches()
 			if [ "$?" -eq 0 ]; then
 				echo "=> Patch applied: \`$i'."
 			else
-				echo -n "*** ERROR: couldn't apply patch '$i'"
-				echo ", aborting ***"
+				echo -n "*** ERROR: couldn't apply patch '$i',"
+				echo	" aborting ***"
 				exit 1
 			fi
 		done
@@ -588,11 +650,11 @@ configure_src_phase()
 		exit 1
 	fi
 
-	echo "=> Running \`\`configure´´ phase for \`$pkgname-$version'."
-
 	# Apply patches if requested by template file
 	[ ! -f $XBPS_APPLYPATCHES_DONE ] && apply_tmpl_patches
 
+	echo "=> Running \`\`configure´´ phase for \`$pkgname-$version'."
+
 	# Run stuff before configure.
 	local rbcf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-configure.sh"
 	[ -f "$rbcf" ] && . $rbcf
@@ -838,14 +900,14 @@ register_pkg_handler()
 		$db_cmd -w btree $XBPS_REGPKG_DB $pkg $version 2>&1 >/dev/null
 		if [ "$?" -ne  0 ]; then
 			echo -n "*** ERROR: couldn't register \`$pkg'"
-			echo " in db file ***"
+			echo	" in db file ***"
 			exit 1
 		fi
 	elif [ "$action" = "unregister" ]; then
 		$db_cmd -d btree $XBPS_REGPKG_DB $pkg 2>&1 >/dev/null
 		if [ "$?" -ne 0 ]; then
 			echo -n "*** ERROR: \`$pkg' not registered "
-			echo "in db file? ***"
+			echo	"in db file? ***"
 			exit 1
 		fi
 	else
@@ -956,9 +1018,11 @@ install_dependencies_pkg()
 
 	doing_deps=true
 
+	echo -n "=> Calculating dependency list for '$pkgname-$version'... "
 	add_dependency_tolist $pkg
 	find_dupdeps_inlist installed
 	find_dupdeps_inlist notinstalled
+	echo "done."
 
 	[ -z "$deps_list" -a -z "$installed_deps_list" ] && return 0