diff --git a/packages/mediacenter/xbmc-pvr/init.d/91_cleanup-logfiles b/packages/mediacenter/xbmc-pvr/init.d/91_cleanup-logfiles
diff --git a/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc b/packages/mediacenter/xbmc-pvr/init.d/92_setup-xbmc
diff --git a/packages/mediacenter/xbmc-pvr/init.d/93_xbmc b/packages/mediacenter/xbmc-pvr/init.d/93_xbmc
diff --git a/packages/mediacenter/xbmc-pvr/install b/packages/mediacenter/xbmc-pvr/install
diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta
diff --git a/packages/mediacenter/xbmc-pvr/patches/rename.sh b/packages/mediacenter/xbmc-pvr/patches/rename.sh
diff --git a/packages/mediacenter/xbmc-pvr/profile.d/xbmc.conf b/packages/mediacenter/xbmc-pvr/profile.d/xbmc.conf
diff --git a/packages/mediacenter/xbmc-pvr/scripts/cputemp b/packages/mediacenter/xbmc-pvr/scripts/cputemp
diff --git a/packages/mediacenter/xbmc-pvr/scripts/gputemp b/packages/mediacenter/xbmc-pvr/scripts/gputemp
diff --git a/packages/mediacenter/xbmc-pvr/scripts/wait_on_xbmc_exit b/packages/mediacenter/xbmc-pvr/scripts/wait_on_xbmc_exit
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/00_addon-sleep b/packages/mediacenter/xbmc-pvr/sleep.d/00_addon-sleep
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc b/packages/mediacenter/xbmc-pvr/sleep.d/61_xbmc_lirc
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd b/packages/mediacenter/xbmc-pvr/sleep.d/62_xbmc_lcd
diff --git a/packages/mediacenter/xbmc-pvr/sleep.d/99_reload_skin b/packages/mediacenter/xbmc-pvr/sleep.d/99_reload_skin
diff --git a/packages/mediacenter/xbmc-pvr/splash/splash.png b/packages/mediacenter/xbmc-pvr/splash/splash.png
diff --git a/packages/mediacenter/xbmc-pvr/splash/splash1.png b/packages/mediacenter/xbmc-pvr/splash/splash1.png
diff --git a/packages/mediacenter/xbmc-pvr/unpack b/packages/mediacenter/xbmc-pvr/unpack
diff --git a/packages/mediacenter/xbmc-theme-Confluence/meta b/packages/mediacenter/xbmc-theme-Confluence/meta
@@ -19,7 +19,11 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="11.0.1"
+if [ "$PVR" = yes ]; then
+  PKG_VERSION="pvr-11.0.1"
+else
+  PKG_VERSION="11.0.1"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

diff --git a/...1-001-add_oe_settings_to_homescreen.patch → ...1-001-add_oe_settings_to_homescreen.patch b/...1-001-add_oe_settings_to_homescreen.patch → ...1-001-add_oe_settings_to_homescreen.patch
diff --git a/...-Confluence-11.0.1-801.04-cec-PR887.patch → ...fluence-pvr-11.0.1-801.04-cec-PR887.patch b/...-Confluence-11.0.1-801.04-cec-PR887.patch → ...fluence-pvr-11.0.1-801.04-cec-PR887.patch
diff --git a/packages/mediacenter/xbmc/install b/packages/mediacenter/xbmc/install
@@ -29,6 +29,9 @@ mkdir -p $INSTALL/usr/bin
   cp $PKG_DIR/scripts/gputemp $INSTALL/usr/bin
   cp $PKG_DIR/scripts/wait_on_xbmc_exit $INSTALL/usr/bin
   cp $PKG_BUILD/tools/EventClients/Clients/XBMC\ Send/xbmc-send.py $INSTALL/usr/bin/xbmc-send
+  if [ "$PVR" = yes ]; then
+    cp $PKG_DIR/scripts/setwakeup.sh $INSTALL/usr/bin
+  fi
 
 mkdir -p $INSTALL/usr/lib/xbmc
   cp $PKG_BUILD/xbmc.bin $INSTALL/usr/lib/xbmc

diff --git a/packages/mediacenter/xbmc/meta b/packages/mediacenter/xbmc/meta
@@ -19,7 +19,11 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="11.0.1"
+if [ "$PVR" = yes ]; then
+  PKG_VERSION="pvr-11.0.1"
+else
+  PKG_VERSION="11.0.1"
+fi
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -143,3 +147,6 @@ fi
   PKG_DEPENDS="$PKG_DEPENDS Imaging"
   PKG_DEPENDS="$PKG_DEPENDS simplejson"
 
+if [ "$PVR" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-vuplus"
+fi
diff --git a/...-add_support_to_specify_GIT_REV-0.1.patch → ...-add_support_to_specify_GIT_REV-0.1.patch b/...-add_support_to_specify_GIT_REV-0.1.patch → ...-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/...vr-11.0.1-303-fix_libdvd_xFLAGS-0.1.patch → ...vr-11.0.1-303-fix_libdvd_xFLAGS-0.1.patch b/...vr-11.0.1-303-fix_libdvd_xFLAGS-0.1.patch → ...vr-11.0.1-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/...c-pvr-11.0.1-311-fix_rsxs_build-0.1.patch → ...c-pvr-11.0.1-311-fix_rsxs_build-0.1.patch b/...c-pvr-11.0.1-311-fix_rsxs_build-0.1.patch → ...c-pvr-11.0.1-311-fix_rsxs_build-0.1.patch
diff --git a/...x_playpause_problem_ticket_7338-0.1.patch → ...x_playpause_problem_ticket_7338-0.1.patch b/...x_playpause_problem_ticket_7338-0.1.patch → ...x_playpause_problem_ticket_7338-0.1.patch
diff --git a/...1.0.1-402-enable_yasm_in_ffmpeg-0.1.patch → ...1.0.1-402-enable_yasm_in_ffmpeg-0.1.patch b/...1.0.1-402-enable_yasm_in_ffmpeg-0.1.patch → ...1.0.1-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/...c-pvr-11.0.1-404-add_lame_check-0.6.patch → ...c-pvr-11.0.1-404-add_lame_check-0.6.patch b/...c-pvr-11.0.1-404-add_lame_check-0.6.patch → ...c-pvr-11.0.1-404-add_lame_check-0.6.patch
diff --git a/...ONOPTIMIZE_with_external_Python-0.1.patch → ...ONOPTIMIZE_with_external_Python-0.1.patch b/...ONOPTIMIZE_with_external_Python-0.1.patch → ...ONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/...r-11.0.1-452-change_lcd_content-0.1.patch → ...r-11.0.1-452-change_lcd_content-0.1.patch b/...r-11.0.1-452-change_lcd_content-0.1.patch → ...r-11.0.1-452-change_lcd_content-0.1.patch
diff --git a/....1-453-add_openelec.tv_RSS_news-0.1.patch → ....1-453-add_openelec.tv_RSS_news-0.1.patch b/....1-453-add_openelec.tv_RSS_news-0.1.patch → ....1-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/...vr-11.0.1-454-disable_backslash-0.1.patch → ...vr-11.0.1-454-disable_backslash-0.1.patch b/...vr-11.0.1-454-disable_backslash-0.1.patch → ...vr-11.0.1-454-disable_backslash-0.1.patch
diff --git a/...11.0.1-457-fix_connection_check-0.1.patch → ...11.0.1-457-fix_connection_check-0.1.patch b/...11.0.1-457-fix_connection_check-0.1.patch → ...11.0.1-457-fix_connection_check-0.1.patch
diff --git a/...-11.0.1-463-add_remote_devinput-0.1.patch → ...-11.0.1-463-add_remote_devinput-0.1.patch b/...-11.0.1-463-add_remote_devinput-0.1.patch → ...-11.0.1-463-add_remote_devinput-0.1.patch
diff --git a/...4-add_eject_keymapping_for_lirc-0.1.patch → ...4-add_eject_keymapping_for_lirc-0.1.patch b/...4-add_eject_keymapping_for_lirc-0.1.patch → ...4-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/...es/xbmc-pvr-11.0.1-801.01-cec-PR570.patch → ...es/xbmc-pvr-11.0.1-801.01-cec-PR570.patch b/...es/xbmc-pvr-11.0.1-801.01-cec-PR570.patch → ...es/xbmc-pvr-11.0.1-801.01-cec-PR570.patch
diff --git a/...-801.02-cec-fixed_possible_deadlock.patch → ...-801.02-cec-fixed_possible_deadlock.patch b/...-801.02-cec-fixed_possible_deadlock.patch → ...-801.02-cec-fixed_possible_deadlock.patch
diff --git a/...s_stopped_before_starting_a_new_one.patch → ...s_stopped_before_starting_a_new_one.patch b/...s_stopped_before_starting_a_new_one.patch → ...s_stopped_before_starting_a_new_one.patch
diff --git a/...es/xbmc-pvr-11.0.1-801.04-cec-PR887.patch → ...es/xbmc-pvr-11.0.1-801.04-cec-PR887.patch b/...es/xbmc-pvr-11.0.1-801.04-cec-PR887.patch → ...es/xbmc-pvr-11.0.1-801.04-cec-PR887.patch
diff --git a/.../xbmc-pvr-11.0.1-806.01-cdrip-PR616.patch → .../xbmc-pvr-11.0.1-806.01-cdrip-PR616.patch b/.../xbmc-pvr-11.0.1-806.01-cdrip-PR616.patch → .../xbmc-pvr-11.0.1-806.01-cdrip-PR616.patch
diff --git a/.../xbmc-pvr-11.0.1-806.02-cdrip-PR718.patch → .../xbmc-pvr-11.0.1-806.02-cdrip-PR718.patch b/.../xbmc-pvr-11.0.1-806.02-cdrip-PR718.patch → .../xbmc-pvr-11.0.1-806.02-cdrip-PR718.patch
diff --git a/...r-11.0.1-901.01-ffmpeg-10.2-28b186f.patch → ...r-11.0.1-901.01-ffmpeg-10.2-28b186f.patch b/...r-11.0.1-901.01-ffmpeg-10.2-28b186f.patch → ...r-11.0.1-901.01-ffmpeg-10.2-28b186f.patch
diff --git a/...es_ended_up_in_internal_lavf_buffer.patch → ...es_ended_up_in_internal_lavf_buffer.patch b/...es_ended_up_in_internal_lavf_buffer.patch → ...es_ended_up_in_internal_lavf_buffer.patch
diff --git a/....03-ffmpeg_crystalhd_implementation.patch → ....03-ffmpeg_crystalhd_implementation.patch b/....03-ffmpeg_crystalhd_implementation.patch → ....03-ffmpeg_crystalhd_implementation.patch
diff --git a/....0.1-901.31-ffmpeg_add_xvba_support.patch → ....0.1-901.31-ffmpeg_add_xvba_support.patch b/....0.1-901.31-ffmpeg_add_xvba_support.patch → ....0.1-901.31-ffmpeg_add_xvba_support.patch
diff --git a/..._new_ffmpeg_fix_artifacts_for_h.264.patch → ..._new_ffmpeg_fix_artifacts_for_h.264.patch b/..._new_ffmpeg_fix_artifacts_for_h.264.patch → ..._new_ffmpeg_fix_artifacts_for_h.264.patch
diff --git a/...33-ffmpeg_xvba_xvba_vc-1_new_ffmpeg.patch → ...33-ffmpeg_xvba_xvba_vc-1_new_ffmpeg.patch b/...33-ffmpeg_xvba_xvba_vc-1_new_ffmpeg.patch → ...33-ffmpeg_xvba_xvba_vc-1_new_ffmpeg.patch
diff --git a/...901.41-avfilter-depends-on-avformat.patch → ...901.41-avfilter-depends-on-avformat.patch b/...901.41-avfilter-depends-on-avformat.patch → ...901.41-avfilter-depends-on-avformat.patch
diff --git a/....0.1-902.00-xdpau_reset_pvr_changes.patch → ....0.1-902.00-xdpau_reset_pvr_changes.patch b/....0.1-902.00-xdpau_reset_pvr_changes.patch → ....0.1-902.00-xdpau_reset_pvr_changes.patch
diff --git a/...1-xvba_support_vdpau_rework-c633159.patch → ...1-xvba_support_vdpau_rework-c633159.patch b/...1-xvba_support_vdpau_rework-c633159.patch → ...1-xvba_support_vdpau_rework-c633159.patch
diff --git a/...-11.0.1-902.02-xvba_support-gcc-4.7.patch → ...-11.0.1-902.02-xvba_support-gcc-4.7.patch b/...-11.0.1-902.02-xvba_support-gcc-4.7.patch → ...-11.0.1-902.02-xvba_support-gcc-4.7.patch
diff --git a/...mc-pvr-11.0.1-981-toggleButtonState.patch → ...mc-pvr-11.0.1-981-toggleButtonState.patch b/...mc-pvr-11.0.1-981-toggleButtonState.patch → ...mc-pvr-11.0.1-981-toggleButtonState.patch
diff --git a/...t-be-remount-in-DeviceChanged-event.patch → ...t-be-remount-in-DeviceChanged-event.patch b/...t-be-remount-in-DeviceChanged-event.patch → ...t-be-remount-in-DeviceChanged-event.patch
diff --git a/...ed-failure-to-broswe-for-smb-shares.patch → ...ed-failure-to-broswe-for-smb-shares.patch b/...ed-failure-to-broswe-for-smb-shares.patch → ...ed-failure-to-broswe-for-smb-shares.patch
diff --git a/...patches/xbmc-pvr-11.0.1-990-wiimote.patch → ...patches/xbmc-pvr-11.0.1-990-wiimote.patch b/...patches/xbmc-pvr-11.0.1-990-wiimote.patch → ...patches/xbmc-pvr-11.0.1-990-wiimote.patch
diff --git a/...eup_at_timer_at_suspend_or_hibernet.patch → ...eup_at_timer_at_suspend_or_hibernet.patch b/...eup_at_timer_at_suspend_or_hibernet.patch → ...eup_at_timer_at_suspend_or_hibernet.patch
diff --git a/...mediacenter/xbmc-pvr/scripts/setwakeup.sh → ...ges/mediacenter/xbmc/scripts/setwakeup.sh b/...mediacenter/xbmc-pvr/scripts/setwakeup.sh → ...ges/mediacenter/xbmc/scripts/setwakeup.sh
diff --git a/projects/ATV/options b/projects/ATV/options
@@ -115,8 +115,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/Fusion/options b/projects/Fusion/options
@@ -114,8 +114,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/Generic/options b/projects/Generic/options
@@ -114,8 +114,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
@@ -114,8 +114,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/ION/options b/projects/ION/options
@@ -114,8 +114,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/Intel/options b/projects/Intel/options
@@ -114,8 +114,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/RPi/options b/projects/RPi/options
@@ -116,8 +116,6 @@
     MEDIACENTER="xbmc-frodo"
   elif [ "$PROJECT" = RPi ]; then
     MEDIACENTER="xbmc-rpi"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/Ultra/options b/projects/Ultra/options
@@ -114,8 +114,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/projects/Virtual/options b/projects/Virtual/options
@@ -109,8 +109,6 @@
 # Mediacenter to use (xbmc / no)
   if [ "$XBMC" = frodo ]; then
     MEDIACENTER="xbmc-frodo"
-  elif [ "$PVR" = yes ]; then
-    MEDIACENTER="xbmc-pvr"
   else
     MEDIACENTER="xbmc"
   fi

diff --git a/tools/mkpkg/mkpkg_xbmc-eden b/tools/mkpkg/mkpkg_xbmc-eden
@@ -20,15 +20,16 @@
 ################################################################################
 
 PKG_NAME="xbmc"
+PKG_VERSION="11.0.1"
 GIT_REPO="-b Eden git://github.com/xbmc/xbmc.git"
-DEST_DIR="$PKG_NAME-eden"
+DEST_DIR="$PKG_NAME-$PKG_VERSION"
 
 echo "getting sources..."
-  if [ ! -d $DEST_DIR-latest ]; then
-    git clone $GIT_REPO $DEST_DIR-latest
+  if [ ! -d $DEST_DIR-eden-latest ]; then
+    git clone $GIT_REPO $DEST_DIR-eden-latest
   fi
 
-  cd $DEST_DIR-latest
+  cd $DEST_DIR-eden-latest
     git pull
 
 echo "getting version..."
@@ -37,40 +38,40 @@ echo "getting version..."
   cd ..
 
 echo "copying sources..."
-  rm -rf $PKG_NAME-11.0.1
-  cp -R $DEST_DIR-latest $PKG_NAME-11.0.1
-  echo "$GIT_REV" > $PKG_NAME-11.0.1/git.version
+  rm -rf $PKG_NAME-$PKG_VERSION
+  cp -R $DEST_DIR-eden-latest $PKG_NAME-$PKG_VERSION
+  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version
 
 echo "cleaning sources..."
-  rm -rf $PKG_NAME-11.0.1/.git
+  rm -rf $PKG_NAME-$PKG_VERSION/.git
 
 echo "seperating theme..."
-  rm -rf $PKG_NAME-theme-Confluence-11.0.1
-  mv $PKG_NAME-11.0.1/addons/skin.confluence $PKG_NAME-theme-Confluence-11.0.1
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
+  mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
 
 echo "cleaning sources..."
-  rm -rf $PKG_NAME-11.0.1/visualisations
-  rm -rf $PKG_NAME-11.0.1/lib/libSDL-*
-  rm -rf $PKG_NAME-11.0.1/lib/libcurl-*
-  rm -rf $PKG_NAME-11.0.1/project
+  rm -rf $PKG_NAME-$PKG_VERSION/visualisations
+  rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
+  rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
+  rm -rf $PKG_NAME-$PKG_VERSION/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
            "PackageMaker" "Translator" "XBMCLive" "XprPack" \
            "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
-    rm -rf $PKG_NAME-11.0.1/tools/$i
+    rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
   done
 
   for i in dll a lib so bat; do
-    find $PKG_NAME-11.0.1 -name *.$i -exec rm -rf {} ";"
+    find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
   done
 
   # bundled win32 binaries
-  rm -r $PKG_NAME-11.0.1/xbmc/visualizations/XBMCProjectM/win32
+  rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
 
 echo "packing sources..."
-  tar cvJf $PKG_NAME-11.0.1.tar.xz $PKG_NAME-11.0.1
-  tar cvJf $PKG_NAME-theme-Confluence-11.0.1.tar.xz $PKG_NAME-theme-Confluence-11.0.1
+  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
+  tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION
 
 echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-11.0.1
-  rm -rf $PKG_NAME-theme-Confluence-11.0.1
+  rm -rf $PKG_NAME-$PKG_VERSION
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
diff --git a/tools/mkpkg/mkpkg_xbmc-eden-pvr b/tools/mkpkg/mkpkg_xbmc-eden-pvr
@@ -19,9 +19,10 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="xbmc-pvr"
+PKG_NAME="xbmc"
+PKG_VERSION="pvr-11.0.1"
 GIT_REPO="-b Eden-pvr git://github.com/opdenkamp/xbmc.git"
-DEST_DIR="$PKG_NAME"
+DEST_DIR="$PKG_NAME-$PKG_VERSION"
 
 echo "getting sources..."
   if [ ! -d $DEST_DIR-eden-latest ]; then
@@ -37,40 +38,40 @@ echo "getting version..."
   cd ..
 
 echo "copying sources..."
-  rm -rf $PKG_NAME-11.0.1
-  cp -R $DEST_DIR-eden-latest $PKG_NAME-11.0.1
-  echo "$GIT_REV" > $PKG_NAME-11.0.1/git.version
+  rm -rf $PKG_NAME-$PKG_VERSION
+  cp -R $DEST_DIR-eden-latest $PKG_NAME-$PKG_VERSION
+  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version
 
 echo "cleaning sources..."
-  rm -rf $PKG_NAME-11.0.1/.git
+  rm -rf $PKG_NAME-$PKG_VERSION/.git
 
 echo "seperating theme..."
-  rm -rf $PKG_NAME-theme-Confluence-11.0.1
-  mv $PKG_NAME-11.0.1/addons/skin.confluence $PKG_NAME-theme-Confluence-11.0.1
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
+  mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
 
 echo "cleaning sources..."
-  rm -rf $PKG_NAME-11.0.1/visualisations
-  rm -rf $PKG_NAME-11.0.1/lib/libSDL-*
-  rm -rf $PKG_NAME-11.0.1/lib/libcurl-*
-  rm -rf $PKG_NAME-11.0.1/project
+  rm -rf $PKG_NAME-$PKG_VERSION/visualisations
+  rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
+  rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
+  rm -rf $PKG_NAME-$PKG_VERSION/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
            "PackageMaker" "Translator" "XBMCLive" "XprPack" \
            "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
-    rm -rf $PKG_NAME-11.0.1/tools/$i
+    rm -rf $PKG_NAME-$PKG_VERSION/tools/$i
   done
 
   for i in dll a lib so bat; do
-    find $PKG_NAME-11.0.1 -name *.$i -exec rm -rf {} ";"
+    find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
   done
 
   # bundled win32 binaries
-  rm -r $PKG_NAME-11.0.1/xbmc/visualizations/XBMCProjectM/win32
+  rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
 
 echo "packing sources..."
-  tar cvJf $PKG_NAME-11.0.1.tar.xz $PKG_NAME-11.0.1
-  tar cvJf $PKG_NAME-theme-Confluence-11.0.1.tar.xz $PKG_NAME-theme-Confluence-11.0.1
+  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
+  tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION
 
 echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-11.0.1
-  rm -rf $PKG_NAME-theme-Confluence-11.0.1
+  rm -rf $PKG_NAME-$PKG_VERSION
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION