diff --git a/tools/mkpkg/mkpkg_tvheadend b/tools/mkpkg/mkpkg_tvheadend
index 358a559993..f81c7dd0ca 100755
--- a/tools/mkpkg/mkpkg_tvheadend
+++ b/tools/mkpkg/mkpkg_tvheadend
@@ -19,38 +19,25 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-MKPKG_CURRENTPATH=$(pwd)
-MKPKG_TMP="$MKPKG_CURRENTPATH/mkpkg-temp"
-
-mkdir -p $MKPKG_TMP
-cd $MKPKG_TMP
-mkdir -p dest
-
-echo "deleteing old revisions..."
-  rm -Rf dest/tvheadend*
-
-echo "getting sources if needed (or update only)"
-  if [ ! -d tvheadend ]; then
-    git clone git://github.com/andoma/tvheadend.git tvheadend
+echo "getting sources..."
+  if [ ! -d hts-tvheadend.git ]; then
+    git clone https://github.com/andoma/tvheadend.git hts-tvheadend.git
   fi
 
-echo "updateing revision..."
-  cd tvheadend
+  cd hts-tvheadend.git
     git pull
-  cd $MKPKG_TMP
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..
 
-echo "getting version..."
-  cd tvheadend
-    REV=$(git rev-parse --short HEAD)
-  cd $MKPKG_TMP
+echo "copying sources..."
+  rm -rf hts-tvheadend-$GIT_REV
+  cp -R hts-tvheadend.git hts-tvheadend-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf hts-tvheadend-$GIT_REV/.git
 
-echo "create repo for packaging tvheadend -> tvheadend-$REV"
-  cp -R tvheadend tvheadend-$REV
-  
 echo "packing sources..."
-  tar cvjf dest/tvheadend-$REV.tar.bz2 --exclude ".git" --exclude ".gitignore" tvheadend-$REV
+  tar cvjf hts-tvheadend-$GIT_REV.tar.bz2 hts-tvheadend-$GIT_REV
 
-echo "CLEANUP"
-  rm -Rf tvheadend-$REV
-
-cd $MKPKG_CURRENTPATH
\ No newline at end of file
+echo "remove temporary sourcedir..."
+  rm -rf hts-tvheadend-$GIT_REV