diff --git a/tools/mkpkg/mkpkg_xbmc b/tools/mkpkg/mkpkg_xbmc
index 51f7959a2e..e22781a15e 100755
--- a/tools/mkpkg/mkpkg_xbmc
+++ b/tools/mkpkg/mkpkg_xbmc
@@ -18,13 +18,13 @@ echo "cleaning sources..."
 
 echo "seperating theme..."
   rm -rf xbmc-theme-Confluence-$SVN_REV
-  mv xbmc-$SVN_REV/skin/Confluence xbmc-theme-Confluence-$SVN_REV
+  mv xbmc-$SVN_REV/addons/skin.confluence xbmc-theme-Confluence-$SVN_REV
+  mv xbmc-$SVN_REV/addons/skin.pm3-hd xbmc-theme-PM3-HD-$SVN_REV
 
 echo "cleaning sources..."
-  rm -rf xbmc-$SVN_REV/visualizations/XBMCProjectM/win32
+  rm -rf xbmc-$SVN_REV/visualisations
   rm -rf xbmc-$SVN_REV/lib/libSDL-*
   rm -rf xbmc-$SVN_REV/lib/libcurl-*
-  rm -rf xbmc-$SVN_REV/skin
   rm -rf xbmc-$SVN_REV/project
 
   for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
@@ -40,7 +40,9 @@ echo "cleaning sources..."
 echo "packing sources..."
   tar cvjf xbmc-$SVN_REV.tar.bz2 xbmc-$SVN_REV
   tar cvjf xbmc-theme-Confluence-$SVN_REV.tar.bz2 xbmc-theme-Confluence-$SVN_REV
+  tar cvjf xbmc-theme-PM3-HD-$SVN_REV.tar.bz2 xbmc-theme-PM3-HD-$SVN_REV
 
 echo "remove temporary sourcedir..."
   rm -rf xbmc-$SVN_REV
   rm -rf xbmc-theme-Confluence-$SVN_REV
+  rm -rf xbmc-theme-PM3-HD-$SVN_REV