diff --git a/libtre-git/PKGBUILD b/libtre/PKGBUILD
similarity index 64%
rename from libtre-git/PKGBUILD
rename to libtre/PKGBUILD
index b65cd317ad4..cfd91d066eb 100644
--- a/libtre-git/PKGBUILD
+++ b/libtre/PKGBUILD
@@ -1,9 +1,8 @@
 # Maintainer: Alexey Pavlov <Alexpux@gmail.com>
 
-pkgname=("libtre-git" "libtre-devel-git")
-_ver_base=0.8.0
-pkgver=0.8.0.128.6fb7206
-pkgrel=3
+pkgname=("libtre" "libtre-devel")
+pkgver=0.9.0
+pkgrel=1
 epoch=
 pkgdesc="The free and portable approximate regex matching library (libraries)"
 arch=("i686" "x86_64")
@@ -13,18 +12,12 @@ license=('BSD')
 groups=('libraries')
 depends=("gettext" "libiconv" "libintl")
 makedepends=("gettext-devel" "libiconv-devel" "gcc" "git" 'autotools')
-_commit="6fb7206b935b35814c5078c20046dbe065435363"
-source=("${pkgname}"::"git+https://github.com/laurikari/tre#commit=${_commit}")
-sha256sums=('SKIP')
+source=("${pkgname}"::"git+https://github.com/laurikari/tre#tag=v${pkgver}")
+sha256sums=('81ac859d391cfd1a240a23ac1b7bda51cee7b75103cf03015cea9ea0b3492c3d')
 msys2_references=(
   'archlinux: tre'
 )
 
-pkgver() {
-  cd "${srcdir}/${pkgname}"
-  printf "%s.%s.%s" "$_ver_base" "$(git rev-list --count "${_commit}")" "$(git rev-parse --short "${_commit}")"
-}
-
 prepare() {
   cd "${srcdir}/${pkgname}"
   mv -f ChangeLog.old  ChangeLog
@@ -44,10 +37,11 @@ check() {
   make -k check
 }
 
-package_libtre-git() {
+package_libtre() {
   depends=("gettext" "libiconv" "libintl")
-  provides=("libtre=${pkgver}")
-  conflicts=("libtre")
+  provides=("libtre-git=${pkgver}")
+  conflicts=("libtre-git")
+  replaces=("libtre-git")
 
   mkdir -p $pkgdir/usr/bin
   cp -rf $srcdir/dest/usr/bin $pkgdir/usr/
@@ -56,12 +50,13 @@ package_libtre-git() {
   cp -rf $srcdir/dest/usr/share $pkgdir/usr/
 }
 
-package_libtre-devel-git() {
+package_libtre-devel() {
   pkgdesc="Libtre headers and libraries (development)"
   groups=('development')
-  depends=("libtre-git=${pkgver}" "gettext-devel" "libiconv-devel")
-  provides=("libtre-devel")
-  conflicts=("libtre-devel")
+  depends=("libtre=${pkgver}" "gettext-devel" "libiconv-devel")
+  provides=("libtre-devel-git=${pkgver}")
+  conflicts=("libtre-devel-git")
+  replaces=("libtre-devel-git")
 
   mkdir -p $pkgdir/usr
   cp -rf $srcdir/dest/usr/include $pkgdir/usr/