diff --git a/scripts/checkdeps b/scripts/checkdeps
index b3bbe1ca2a..d9e0209ad4 100755
--- a/scripts/checkdeps
+++ b/scripts/checkdeps
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. config/options
+. config/options $1
 
 deps=
 deps_pkg=
@@ -13,29 +13,10 @@ case $1 in
     deps_pkg="wget"
     ;;
   build)
-    deps="gcc g++ sed patch touch nasm tar bzip2 gzip perl flex bison cp gawk mkfontscale cpio makedepend makeinfo msgfmt xkbcomp gperf libtool cmp yacc lzma xsltproc"
-    deps_pkg="gcc g++ sed patch fileutils nasm tar bzip2 gzip perl flex bison coreutils gawk xfonts-utils cpio makedepend texinfo gettext x11-xkb-utils gperf libtool diff lzma xsltproc"
-    files="/usr/include/stdio.h /usr/include/readline/readline.h /usr/include/zlib.h /usr/include/ncurses.h /usr/include/freetype2/freetype/freetype.h /usr/include/expat.h /usr/include/dbus-1.0/dbus/dbus.h /usr/include/jpeglib.h"
-    files_pkg="libc6-dev libreadline5-dev zlib1g-dev libncurses5-dev libfreetype6-dev libexpat1-dev libdbus-1-dev libjpeg-dev"
-    ;;
-  burn)
-    deps="cdrecord"
-    deps_pkg="cdrecord"
-    ;;
-  iso)
-    deps="mkisofs"
-    if [ -f /etc/debian_version -a -n "`which aptitude 2>/dev/null`" ]; then
-      deps_pkg="mkisofs genisoimage"
-    else
-      deps_pkg="mkisofs"
-    fi
-    ;;
-  vmx)
-    if [ ! `which vmplayer` ]; then
-      echo "Your system doesn't seem to have VMplayer installed"
-      echo "It is mandatory to play a VMware virtual machine."
-      exit 1
-    fi
+    deps="gcc g++ sed patch touch nasm tar bzip2 gzip perl flex bison cp gawk makeinfo gettext gperf libtool diff byacc xsltproc"
+    deps_pkg="gcc g++ sed patch fileutils nasm tar bzip2 gzip perl flex bison coreutils gawk texinfo gettext gperf libtool diff byacc xsltproc"
+    files="/usr/include/stdio.h /usr/include/zlib.h /usr/include/ncurses.h"
+    files_pkg="libc6-dev zlib1g-dev libncurses5-dev"
     ;;
   qemu)
     if [ ! `which qemu` ]; then
@@ -62,7 +43,7 @@ while file=`getarg $i $files` && [ -n "$file" ]; do
 done
 
 if [ -n "$need" ]; then
-  echo "**** Your system lacks the following tools needed to $1 GeeXboX ****"
+  echo "**** Your system lacks the following tools needed to $1 OpenELEC.tv ****"
   echo $need
 
   [ -f /etc/lsb-release ] && . /etc/lsb-release
@@ -71,26 +52,20 @@ if [ -n "$need" ]; then
     DISTRO="a Debian" 
     [ "$DISTRIB_ID" = "Ubuntu" ] && DISTRO="an Ubuntu"
     echo "**** You seem to use $DISTRO system ****"
-    read -p "would you like to sudo aptitude install the needed tools ? (y/n) " ans
+    read -p "would you like to install the needed tools ? (y/n) " ans
     [ "$ans" = "y" ] && sudo aptitude install $need_pkg
   elif [ -f /etc/mandrake-release -a -n "`which urpmi 2>/dev/null`" ]; then
     echo "**** You seem to use a mandrake system ****"
-    if [ "$UID" -ne 0 ]; then
-      echo "**** I could install those packages but you need to be root for this ****"
-      exit 1
-    else
-      read -p "would you like to urpmi the needed tools ? (y/n) " ans
-      [ "$ans" = "y" ] && urpmi $need_pkg
-    fi
+    read -p "would you like to install the needed tools ? (y/n) " ans
+    [ "$ans" = "y" ] && sudo urpmi $need_pkg
   elif [ -f /etc/gentoo-release -a -n "`which emerge 2>/dev/null`" ]; then
     echo "**** You seem to use a gentoo system ****"
-    if [ "$UID" -ne 0 ]; then
-      echo "**** I could install those packages but you need to be root for this ****"
-      exit 1
-    else
-      read -p "would you like to emerge the needed tools ? (y/n) " ans
-      [ "$ans" = "y" ] && emerge -D $need_pkg
-    fi
+    read -p "would you like to install the needed tools ? (y/n) " ans
+    [ "$ans" = "y" ] && sudo emerge -D $need_pkg
+  elif [ -f /etc/fedora-release -a -n "`which yum 2>/dev/null`" ]; then
+    echo "**** You seem to use a fedora system ****"
+    read -p "would you like to install the needed tools ? (y/n) " ans
+    [ "$ans" = "y" ] && sudo urpmi $need_pkg
   else
     echo "********"
     exit 1