diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
index 5fde37a539..358a559993 100755
--- a/tools/mkpkg/mkpkg_tvheadend
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -24,20 +24,10 @@ MKPKG_TMP="$MKPKG_CURRENTPATH/mkpkg-temp"
 
 mkdir -p $MKPKG_TMP
 cd $MKPKG_TMP
+mkdir -p dest
 
 echo "deleteing old revisions..."
-  ls $MKPKG_TMP | \
-  while read I; do
-    if [ -f "${I}" ] ; then
-      case "${I}" in
-        tvheadend.tar.bz2)  rm "${I}";;
-      esac
-    elif [ -d "${I}" ] ; then
-      case "${I}" in
-        tvheadend) rm -Rf "${I}";;
-      esac
-    fi
-  done
+  rm -Rf dest/tvheadend*
 
 echo "getting sources if needed (or update only)"
   if [ ! -d tvheadend ]; then
@@ -53,8 +43,14 @@ echo "getting version..."
   cd tvheadend
     REV=$(git rev-parse --short HEAD)
   cd $MKPKG_TMP
+
+echo "create repo for packaging tvheadend -> tvheadend-$REV"
+  cp -R tvheadend tvheadend-$REV
   
 echo "packing sources..."
-  tar cvjf tvheadend-$REV.tar.bz2 tvheadend
+  tar cvjf dest/tvheadend-$REV.tar.bz2 --exclude ".git" --exclude ".gitignore" tvheadend-$REV
+
+echo "CLEANUP"
+  rm -Rf tvheadend-$REV
 
 cd $MKPKG_CURRENTPATH
\ No newline at end of file