diff --git a/ssh-pageant-git/PKGBUILD b/ssh-pageant/PKGBUILD
similarity index 58%
rename from ssh-pageant-git/PKGBUILD
rename to ssh-pageant/PKGBUILD
index 8c803676..c1b63e12 100644
--- a/ssh-pageant-git/PKGBUILD
+++ b/ssh-pageant/PKGBUILD
@@ -1,28 +1,23 @@
 _realname=ssh-pageant
-_ver_base=1.4
-
-pkgname="${_realname}-git"
-pkgver=1.4.12.g6f47092
+pkgname="${_realname}"
+pkgver=v1.4.r15.gc804ba4
 pkgrel=1
 pkgdesc="An SSH authentication agent for Cygwin/MSYS to PuTTY's Pageant"
-
+_commit="c804ba43bfd63bc058b7ab86a96953572511e263"
 url="https://github.com/cuviper/ssh-pageant"
-license=("GPL3")
-
+license=("spdx:GPL-3.0-or-later")
 arch=("i686" "x86_64")
 makedepends=("git" "gcc")
-
-provides=("${_realname}")
-conflicts=("${_realname}")
-
-options=("strip")
-
-source=("${_realname}"::"git+https://github.com/cuviper/ssh-pageant.git")
+provides=("${_realname}-git")
+conflicts=("${_realname}-git")
+replaces=("${_realname}-git")
+source=("${_realname}"::"git+https://github.com/cuviper/ssh-pageant.git#commit=${_commit}")
 sha256sums=('SKIP')
 
 pkgver() {
   cd "$srcdir/$_realname"
-  git describe --tags | sed -e "s/v//" -e "s/-/./g"
+
+  git describe --long --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {