--- a/tools/Linux/packaging/pbuilder-dist
+++ b/tools/Linux/packaging/pbuilder-dist
@@ -1,7 +1,7 @@
 #!/bin/sh
 # script from Jamin W. Collins  BTS: #255165
 #        modded by Oumar Aziz OUATTARA
-# 
+#
 # Set the PBUILDER_XBMC_BASE_DIR var to your custom pbuilder base directory. You can set it while calling the script.
 # To select an ubuntu distribution to launch the build, use the first argument of the script.
 # The second is the actual command to launch.
@@ -10,7 +10,16 @@
 DISTRIBUTION=$1
 PROCEED=false
 
-if [ -z $PBUILDER_XBMC_BASE_DIR ] ; then 
+MIRRORLIST="deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu $DISTRIBUTION main|\
+deb http://security.ubuntu.com/ubuntu $DISTRIBUTION-security main restricted universe multiverse|\
+deb http://archive.ubuntu.com/ubuntu/ $DISTRIBUTION-backports main restricted universe multiverse|\
+deb http://archive.ubuntu.com/ubuntu/ $DISTRIBUTION-updates main restricted universe multiverse"
+
+if [ "$DISTRIBUTION" != "maverick" ]; then
+    MIRRORLIST="$MIRRORLIST|deb http://ppa.launchpad.net/nvidia-vdpau/ppa/ubuntu $DISTRIBUTION main"
+fi
+
+if [ -z $PBUILDER_XBMC_BASE_DIR ] ; then
    PBUILDER_XBMC_BASE_DIR="/var/cache/pbuilder"
 fi
 
@@ -30,11 +39,7 @@
       --extrapackages "less vim gnupg" \
       --mirror "http://archive.ubuntu.com/ubuntu/" \
       --components "main restricted universe multiverse" \
-      --othermirror "deb http://ppa.launchpad.net/team-xbmc/ppa/ubuntu $DISTRIBUTION main|\
-deb http://ppa.launchpad.net/nvidia-vdpau/ppa/ubuntu $DISTRIBUTION main|\
-deb http://security.ubuntu.com/ubuntu $DISTRIBUTION-security main restricted universe multiverse|\
-deb http://archive.ubuntu.com/ubuntu/ $DISTRIBUTION-backports main restricted universe multiverse|\
-deb http://archive.ubuntu.com/ubuntu/ $DISTRIBUTION-updates main restricted universe multiverse" "$@"
+      --othermirror "$MIRRORLIST" "$@"
 
 else
    echo "Usage: $0 [distribution] [command] "