diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta
index 4e3040a75b..a3a32539d0 100644
--- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta
@@ -18,14 +18,14 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="xbmc-theme-Confluence"
+PKG_NAME="xbmc-pvr-theme-Confluence"
 PKG_VERSION="2e00d86"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+#PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build
index 319ee97904..5cb9c795e6 100755
--- a/packages/mediacenter/xbmc-pvr/build
+++ b/packages/mediacenter/xbmc-pvr/build
@@ -152,8 +152,6 @@ cd $PKG_BUILD
 # adding fake Makefile for stripped skin
   mkdir -p addons/skin.confluence/media
   touch addons/skin.confluence/media/Makefile.in
-  mkdir -p addons/skin.touched/media
-  touch addons/skin.touched/media/Makefile.in
 
 # autoreconf
   do_autoreconf
diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta
index 0b5b0989d4..b8c325f778 100644
--- a/packages/mediacenter/xbmc-pvr/meta
+++ b/packages/mediacenter/xbmc-pvr/meta
@@ -18,15 +18,15 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="xbmc"
+PKG_NAME="xbmc-pvr"
 PKG_VERSION="2e00d86"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.xbmc.org"
-#PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr "
+PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+#PKG_URL="http://gujs.openelec.tv/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_DEPENDS="boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql alsa bc xbmc-addon-settings xbmc-addon-xvdr"
 PKG_BUILD_DEPENDS="toolchain boost Python zlib bzip2 lzo pcre alsa-lib libass enca curl libssh rtmpdump $MESA glew fontconfig fribidi $LIBJPEG libpng tiff freetype jasper libmad libsamplerate libogg libvorbis libcdio libmodplug faad2 flac lame libmpeg2 SDL SDL_mixer SDL_image yajl sqlite mysql"
 PKG_PRIORITY="optional"
 PKG_SECTION="mediacenter"
diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc
index 7793fc7404..51396a48d7 100755
--- a/tools/mkpkg/mkpkg_xbmc
+++ b/tools/mkpkg/mkpkg_xbmc
@@ -20,7 +20,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-GIT_REPO="-b pvr-ppa git://github.com/opdenkamp/xbmc.git"
+GIT_REPO="-b master git://github.com/xbmc/xbmc.git"
 DEST_DIR="$PKG_NAME"
 
 echo "getting sources..."
diff --git a/tools/mkpkg/mkpkg_xbmc-pvr b/tools/mkpkg/mkpkg_xbmc-pvr
new file mode 100755
index 0000000000..3b0d72f210
--- /dev/null
+++ b/tools/mkpkg/mkpkg_xbmc-pvr
@@ -0,0 +1,80 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xbmc-pvr"
+GIT_REPO="-b pvr-ppa git://github.com/opdenkamp/xbmc.git"
+DEST_DIR="$PKG_NAME"
+
+echo "getting sources..."
+  if [ ! -d $DEST_DIR-latest ]; then
+    git clone $GIT_REPO $DEST_DIR-latest
+  fi
+
+  cd $DEST_DIR-latest
+    git pull
+
+echo "getting version..."
+  GIT_REV=`git log -n1 --format=%h`
+  echo $GIT_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf $PKG_NAME-$GIT_REV
+  cp -R $DEST_DIR-latest $PKG_NAME-$GIT_REV
+  echo "$GIT_REV" > $PKG_NAME-$GIT_REV/git.version
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$GIT_REV/.git
+
+echo "seperating theme..."
+  rm -rf $PKG_NAME-theme-Confluence-$GIT_REV
+  mv $PKG_NAME-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$GIT_REV
+#  rm -rf $PKG_NAME-theme-Touched-$GIT_REV
+#  mv $PKG_NAME-$GIT_REV/addons/skin.touched $PKG_NAME-theme-Touched-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$GIT_REV/visualisations
+  rm -rf $PKG_NAME-$GIT_REV/lib/libSDL-*
+  rm -rf $PKG_NAME-$GIT_REV/lib/libcurl-*
+  rm -rf $PKG_NAME-$GIT_REV/project
+
+  for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
+           "PackageMaker" "Translator" "XBMCLive" "XprPack" \
+           "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
+    rm -rf $PKG_NAME-$GIT_REV/tools/$i
+  done
+
+  for i in dll a lib so bat; do
+    find $PKG_NAME-$GIT_REV -name *.$i -exec rm -rf {} ";"
+  done
+
+  # bundled win32 binaries
+  rm -r $PKG_NAME-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32
+
+echo "packing sources..."
+  tar cvJf $PKG_NAME-$GIT_REV.tar.xz $PKG_NAME-$GIT_REV
+  tar cvJf $PKG_NAME-theme-Confluence-$GIT_REV.tar.xz $PKG_NAME-theme-Confluence-$GIT_REV
+#  tar cvJf $PKG_NAME-theme-Touched-$GIT_REV.tar.xz $PKG_NAME-theme-Touched-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf $PKG_NAME-$GIT_REV
+  rm -rf $PKG_NAME-theme-Confluence-$GIT_REV
+#  rm -rf $PKG_NAME-theme-Touched-$GIT_REV