diff --git a/tcsh/trunk/PKGBUILD b/tcsh/trunk/PKGBUILD
index fe04419484..7c08630ff8 100644
--- a/tcsh/trunk/PKGBUILD
+++ b/tcsh/trunk/PKGBUILD
@@ -5,37 +5,31 @@
 
 pkgname=tcsh
 pkgver=6.24.01
-pkgrel=1
+pkgrel=2
 pkgdesc='Enhanced version of the Berkeley C shell'
 arch=('x86_64')
 url='https://www.tcsh.org/'
 license=('BSD')
 depends=('ncurses' 'libxcrypt')
-makedepends=('git')
 backup=('etc/csh.cshrc'
         'etc/csh.login')
 install='tcsh.install'
-_commit='29704a774460fec5fa541b9f3b34e6377220a2ac'
-source=(
-  "$pkgname::git+https://github.com/tcsh-org/tcsh.git#commit=$_commit"
-  'csh.cshrc'
-  'csh.login'
+source=(https://astron.com/pub/tcsh/tcsh-${pkgver}.tar.gz{,.asc}
+        'csh.cshrc'
+        'csh.login'
 )
-sha512sums=('SKIP'
+validpgpkeys=('AD87109763D8D8C2C94CBA8065C26E471F45B123') # Kimmo Suominen
+sha512sums=('47425f9bc5ae3df163fe1c9f8a1b1a6c3893b186843d561fb7020c75561587286036cc679212f17fd0f760735d9e01da414e60a69db0ffcb74276f053ea80479'
+            'SKIP'
             '0710c014b7b42ba8c69beb20ec2b8da44c9318013e83e8a38b2c94da1b11beb50a62cc9d82b7db1b3ee79bb0acf5f2a199e2ee2d745d541ea787e3c6a0069844'
             '97f9f3e376517bd47aee67b48456b4892e0cb2c6f9c3e4b49d7b75cc23f52e69b06f024fbca1e72442d443720753b93fd9714160e551eab54d3de3757268d2d7')
-b2sums=('SKIP'
+b2sums=('4f3005e98d02aa12cea41405ab7e56cd840ba207d36a657699041b045f537bfbf1c992a20435ee97ea21b4bb25f0d7af532ccd2ef50de8542ca94f914e3f3ca5'
+        'SKIP'
         '016e65a672aba6d9b7283d63435a8ebd01818d56f11fb3c1203b1fd51fb1a67760c8f53b22be409319b3db18b0f81df09103de673579a5a5e1b6e07109069f94'
         'da0fa27875507d646e869c5a8cdfecb793cd848c38e626704cdf5adb8ec2eef7fd98e3bab6eceea7d99fda25093364c48a8c44417575574a5ad0753b87cef2e3')
 
-pkgver() {
-  cd "$pkgname"
-
-  git describe --tags | sed -e 's/^TCSH//' -e 's/_/./g'
-}
-
 build() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   ./configure \
     --prefix=/usr \
@@ -46,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "$pkgname"
+  cd "$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" mandir=/usr/share/man install install.man