diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk
index ea92b407fe..3e14aef58c 100644
--- a/packages/graphics/mesa/package.mk
+++ b/packages/graphics/mesa/package.mk
@@ -17,13 +17,12 @@
 ################################################################################
 
 PKG_NAME="mesa"
-PKG_VERSION="10.6.0-rc3"
+PKG_VERSION="10.6.0"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="OSS"
 PKG_SITE="http://www.mesa3d.org/"
 PKG_URL="ftp://freedesktop.org/pub/mesa/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz"
-PKG_URL="ftp://freedesktop.org/pub/mesa/10.6.0/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain Python:host expat glproto dri2proto presentproto libdrm libXext libXdamage libXfixes libXxf86vm libxcb libX11 systemd dri3proto libxshmfence"
 PKG_PRIORITY="optional"
 PKG_SECTION="graphics"
diff --git a/tools/mkpkg/mkpkg_kodi b/tools/mkpkg/mkpkg_kodi
index 2006772c1f..edc250f1d3 100755
--- a/tools/mkpkg/mkpkg_kodi
+++ b/tools/mkpkg/mkpkg_kodi
@@ -98,11 +98,11 @@ for addon in $DEST_DIR.git/project/cmake/addons/addons/*.* ; do
 done
 
 cd $DEST_DIR.git
-GIT_REV=`git log -n1 --format=%h`
+GIT_HASH=`git log -n1 --format=%h`
 VERSION_MAJOR=$(grep ^VERSION_MAJOR version.txt | cut -d" " -f2)
 VERSION_MINOR=$(grep ^VERSION_MINOR version.txt | cut -d" " -f2)
 VERSION_TAG=$(grep ^VERSION_TAG version.txt | cut -d" " -f2 | tr A-Z a-z)
-PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$VERSION_TAG-$GIT_REV"
+PKG_VERSION="$VERSION_MAJOR.$VERSION_MINOR-$VERSION_TAG-$GIT_HASH"
 echo $PKG_VERSION
 cd ..