diff --git a/config/options b/config/options
index 979a69a53d..7f2cecee06 100644
--- a/config/options
+++ b/config/options
@@ -52,15 +52,11 @@ fi
 # verbose compilation mode (yes/no)
   VERBOSE=yes
 
-# download new sources when url file is updated (yes/no/ask)
-  AUTOUPDATE=yes
-
 # Concurrency make level (-j option)
 #  Try value 1 (default) to 4 on single CPU computer, or more on
 #  multi-processor computer (like hyperthreading SMP CPU)
   CONCURRENCY_MAKE_LEVEL=1
 
-
 # set jpeg library depending on ARCH
   if [ "$TARGET_ARCH" = "i386" -o "$TARGET_ARCH" = "x86_64" ]; then
     LIBJPEG="libjpeg-turbo"
diff --git a/config/path b/config/path
index 42f798891b..828966cda6 100644
--- a/config/path
+++ b/config/path
@@ -274,6 +274,11 @@ VERSION_SUFFIX=$TARGET_ARCH
    . ~/.openelec/$PROJECT/options
  fi
 
+PACKAGE_URL="$PKG_DIR/url"
+[ -r "$PACKAGE_URL.$TARGET_ARCH" ] && PACKAGE_URL="$PACKAGE_URL.$TARGET_ARCH"
+[ -n "$TARGET_PLATFORM" -a -r "$PACKAGE_URL.$TARGET_PLATFORM" ] && \
+PACKAGE_URL="$PACKAGE_URL.$TARGET_PLATFORM"
+
 kernel_path() {
   ls -d $ROOT/$BUILD/linux-[0-9]*
 }
diff --git a/scripts/clean b/scripts/clean
index 28b156b56b..adde14642a 100755
--- a/scripts/clean
+++ b/scripts/clean
@@ -7,11 +7,7 @@ clean ()
   echo " CLEAN    $1" >&$SILENT_OUT
 
   if [ "$CLEAN_SOURCES" = true ]; then
-    if [ -f $PKG_DIR/url ]; then
-      for i in `ls $SOURCES/$1 2>/dev/null`; do
-        grep -q $i $PKG_DIR/url || rm -f $SOURCES/$1/$i
-      done
-    fi
+    rm -rf $SOURCES/$1
     return
   fi
 
diff --git a/scripts/extract b/scripts/extract
index d5af3c99b9..ffc2a0355c 100755
--- a/scripts/extract
+++ b/scripts/extract
@@ -7,9 +7,16 @@ if [ -z "$3" ]; then
   exit 1
 fi
 
-[ ! -d "$SOURCES/$1" -o ! -f $PKG_DIR/url -o ! -d "$3" ] && exit 1
+[ ! -f $PACKAGE_URL -a -z "$PKG_URL" ] && exit 1
+[ ! -d "$SOURCES/$1" -o ! -d "$3" ] && exit 1
 
-for s in `sed 's%.*/\(.*\)\$%\1%' $PKG_DIR/url`; do
+[ -f $PACKAGE_URL ] && \
+  FILES=`sed 's%.*/\(.*\)\$%\1%' $PACKAGE_URL`
+
+[ -n "$PKG_URL" ] && \
+  FILES="$FILES `echo $PKG_URL | sed 's%.*/\(.*\)\$%\1%'`"
+
+for s in $FILES; do
   case $s in
   $2)
     f="$SOURCES/$1/$s"
diff --git a/scripts/get b/scripts/get
index 65e1801a22..f9cc3f6cb5 100755
--- a/scripts/get
+++ b/scripts/get
@@ -5,17 +5,21 @@
 mkdir -p $STAMPS_NOARCH/$1
 STAMP=$STAMPS_NOARCH/$1/get
 
-if [ -f $PKG_DIR/url ]; then
+if [ -f $PACKAGE_URL ]; then
   if [ -f $STAMP ]; then
-    [ ! $STAMP -ot $PKG_DIR/url -o $AUTOUPDATE = no ] && exit 0
-    if [ $AUTOUPDATE = ask ]; then
-      echo "Package $1 is not up to date."
-      echo -n "Do you want to download an up to date version ? (y/n) "
-      read UPDATE
-      [ "$UPDATE" = y ] || exit 0
-    fi
+    [ ! $STAMP -ot $PACKAGE_URL ] && exit 0
   fi
+  DL="yes"
+fi
 
+if [ -n "$PKG_URL" ]; then
+  if [ -f $STAMP ]; then
+    [ ! $STAMP -ot $PKG_DIR/meta ] && exit 0
+  fi
+  DL="yes"
+fi
+
+if [ "$DL" = yes ]; then
   $SCRIPTS/checkdeps get
 
   rm -f $STAMP
@@ -27,7 +31,13 @@ if [ -f $PKG_DIR/url ]; then
 
   mkdir -p $SOURCES/$1
 
-  for i in `sed s%GEEXBOX_SRCS%$GEEXBOX_SRCS% $PKG_DIR/url`; do
+  [ -f $PACKAGE_URL ] && \
+    URLS=`sed s%GEEXBOX_SRCS%$GEEXBOX_SRCS% $PACKAGE_URL`
+
+  [ -n "$PKG_URL" ] && \
+    URLS="$URLS `echo $PKG_URL | sed s%GEEXBOX_SRCS%$GEEXBOX_SRCS%`"
+
+  for i in $URLS; do
     NBWGET=1
     until [ -f $STAMPS_NOARCH/$1/`basename $i`.ok ] || wget --passive-ftp -c $WGET_OPT -P $SOURCES/$1 $i; do
       NBWGET=$(($NBWGET+1))
@@ -39,7 +49,12 @@ if [ -f $PKG_DIR/url ]; then
     touch $STAMPS_NOARCH/$1/`basename $i`.ok
   done
 
-  cp -p $PKG_DIR/url $STAMP
+  [ -f $PACKAGE_URL ] && \
+    cp -p $PACKAGE_URL $STAMP
+
+  [ -n "$PKG_URL" ] && \
+    cp -p $PKG_DIR/meta $STAMP
+
   rm -f $BUILD_BASE*/$STAMPS_NOARCH/$1/unpack
   rm -f $BUILD_BASE*/$STAMPS_NOARCH/$1/build
 fi
diff --git a/scripts/unpack b/scripts/unpack
index 91b61f9e30..59f15d193f 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -34,7 +34,7 @@ rm -rf $BUILD/$1[-_]cvs*
 rm -rf $BUILD/$1[-_]svn*
 rm -rf $BUILD/$1[-_]git*
 
-if [ -f $PKG_DIR/url ]; then
+if [ -f $PACKAGE_URL -o -n "$PKG_URL" ]; then
   $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
   $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
   $SCRIPTS/extract $1 "$1*.tgz"     $BUILD