diff --git a/tools/mkpkg/mkpkg_xbmc-pvr b/tools/mkpkg/mkpkg_xbmc-pvr
index f09a387f46..10775f70f8 100755
--- a/tools/mkpkg/mkpkg_xbmc-pvr
+++ b/tools/mkpkg/mkpkg_xbmc-pvr
@@ -12,6 +12,7 @@ echo "getting version..."
 echo "copying sources..."
   rm -rf xbmc-pvr-$SVN_REV
   cp -R xbmc-pvr-latest xbmc-pvr-$SVN_REV
+  echo "$SVN_REV" > xbmc-pvr-$SVN_REV/svn.version
 
 echo "cleaning sources..."
   find xbmc-pvr-$SVN_REV -name .svn -exec rm -rf {} ";"
@@ -19,8 +20,6 @@ echo "cleaning sources..."
 echo "seperating theme..."
   rm -rf xbmc-pvr-theme-Confluence-$SVN_REV
   mv xbmc-pvr-$SVN_REV/addons/skin.confluence xbmc-pvr-theme-Confluence-$SVN_REV
-  rm -rf xbmc-pvr-theme-PM3-HD-$SVN_REV
-  mv xbmc-pvr-$SVN_REV/addons/skin.pm3-hd xbmc-pvr-theme-PM3-HD-$SVN_REV
 
 echo "cleaning sources..."
   rm -rf xbmc-pvr-$SVN_REV/visualisations
@@ -38,12 +37,22 @@ echo "cleaning sources..."
     find xbmc-pvr-$SVN_REV -name *.$i -exec rm -rf {} ";"
   done
 
+  # remove bundled libraries (including zlib and OSX), saves space and forces using external versions
+  for i in cximage-6.0/zlib libid3tag/zlib zlib
+  do
+    rm -rf xbmc-pvr-$SVN_REV/xbmc/lib/$i
+  done
+
+  # bundled win32 binaries
+  rm -r xbmc-pvr-$SVN_REV/xbmc/visualizations/XBMCProjectM/win32
+
+  # remove various headers 
+  rm xbmc-pvr-$SVN_REV/xbmc/FileSystem/zlib.h
+
 echo "packing sources..."
   tar cvjf xbmc-pvr-$SVN_REV.tar.bz2 xbmc-pvr-$SVN_REV
   tar cvjf xbmc-pvr-theme-Confluence-$SVN_REV.tar.bz2 xbmc-pvr-theme-Confluence-$SVN_REV
-  tar cvjf xbmc-pvr-theme-PM3-HD-$SVN_REV.tar.bz2 xbmc-pvr-theme-PM3-HD-$SVN_REV
 
 echo "remove temporary sourcedir..."
   rm -rf xbmc-pvr-$SVN_REV
   rm -rf xbmc-pvr-theme-Confluence-$SVN_REV
-  rm -rf xbmc-pvr-theme-PM3-HD-$SVN_REV
\ No newline at end of file