diff --git a/PKGBUILD b/PKGBUILD
index ce7fa82..775aec6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -29,8 +29,8 @@ provides=(
 )
 replaces=(alacritty-terminfo)
 source=(
-  https://invisible-island.net/archives/${pkgname}/${pkgname}-${pkgver}.tar.gz
-  https://invisible-island.net/archives/${pkgname}/${pkgname}-${pkgver}.tar.gz.asc
+  $pkgname::https://invisible-island.net/archives/${pkgname}/${pkgname}-${pkgver}.tar.gz
+  $pkgname.asc::https://invisible-island.net/archives/${pkgname}/${pkgname}-${pkgver}.tar.gz.asc
   $pkgname-6.3-libs.patch
   $pkgname-6.3-pkgconfig.patch
 )
@@ -46,10 +46,10 @@ validpgpkeys=('19882D92DDA4C400C22C0D56CC2AF4472167BE03')  # Thomas Dickey <dick
 
 prepare() {
   # do not link against test libraries
-  patch -Np1 -d $pkgname -i ../$pkgname-6.3-libs.patch
+  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-6.3-libs.patch
   # do not leak build-time LDFLAGS into the pkgconfig files:
   # https://bugs.archlinux.org/task/68523
-  patch -Np1 -d $pkgname -i ../$pkgname-6.3-pkgconfig.patch
+  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-6.3-pkgconfig.patch
   # NOTE: can't run autoreconf because the autotools setup is custom and ancient
 }
 
@@ -72,7 +72,7 @@ build() {
     --without-ada
   )
 
-  cd $pkgname
+  cd $pkgname-$pkgver
   ./configure "${configure_options[@]}"
   make
 }
@@ -80,8 +80,8 @@ build() {
 package() {
   local _pkgver=${pkgver/_*/}
 
-  make DESTDIR="$pkgdir" install -C $pkgname
-  install -vDm 644 $pkgname/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
+  make DESTDIR="$pkgdir" install -C $pkgname-$pkgver
+  install -vDm 644 $pkgname-$pkgver/COPYING -t "$pkgdir/usr/share/licenses/$pkgname/"
 
   # fool packages looking to link to non-wide-character ncurses libraries
   for lib in ncurses ncurses++ form panel menu; do