diff --git a/packages/mediacenter/xbmc-addon-vuplus/meta b/packages/mediacenter/xbmc-addon-vuplus/meta
index 038f753c8e..8fb67a095b 100644
--- a/packages/mediacenter/xbmc-addon-vuplus/meta
+++ b/packages/mediacenter/xbmc-addon-vuplus/meta
@@ -19,14 +19,13 @@
 ################################################################################
 
 PKG_NAME="xbmc-addon-vuplus"
-# PKG_VERSION="master"
-PKG_VERSION="e20c7a0174"
+PKG_VERSION="e20c7a0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/jdembski/xbmc-addon-vuplus"
-PKG_URL="https://github.com/jdembski/xbmc-addon-vuplus/tarball/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
-PKG_DEPENDS=""
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="curl"
 PKG_BUILD_DEPENDS="toolchain curl"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
diff --git a/packages/mediacenter/xbmc-addon-vuplus/rename b/packages/mediacenter/xbmc-addon-vuplus/rename
deleted file mode 100755
index 7f646756c3..0000000000
--- a/packages/mediacenter/xbmc-addon-vuplus/rename
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-. config/options $1
-
-cd $BUILD
-mv jdembski-${PKG_NAME}-* ${PKG_NAME}-${PKG_VERSION}
diff --git a/tools/mkpkg/mkpkg_xbmc-addon-vuplus b/tools/mkpkg/mkpkg_xbmc-addon-vuplus
new file mode 100755
index 0000000000..8fb7da9656
--- /dev/null
+++ b/tools/mkpkg/mkpkg_xbmc-addon-vuplus
@@ -0,0 +1,43 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+echo "getting sources..."
+  if [ ! -d xbmc-addon-vuplus.git ]; then
+    git clone git://github.com/jdembski/xbmc-addon-vuplus.git xbmc-addon-vuplus.git
+  fi
+
+  cd xbmc-addon-vuplus.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
+
+echo "copying sources..."
+  rm -rf xbmc-addon-vuplus-$GIT_REV
+  cp -R xbmc-addon-vuplus.git xbmc-addon-vuplus-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf xbmc-addon-vuplus-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf xbmc-addon-vuplus-$GIT_REV.tar.xz xbmc-addon-vuplus-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf xbmc-addon-vuplus-$GIT_REV