diff --git a/kitty/trunk/PKGBUILD b/kitty/trunk/PKGBUILD
index 91416cf549..654f7ab852 100644
--- a/kitty/trunk/PKGBUILD
+++ b/kitty/trunk/PKGBUILD
@@ -6,19 +6,27 @@
 pkgbase=kitty
 pkgname=(kitty kitty-terminfo)
 pkgver=0.20.2
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern, hackable, featureful, OpenGL-based terminal emulator"
 arch=('x86_64')
 url="https://github.com/kovidgoyal/kitty"
 license=('GPL3')
 depends=('python3' 'freetype2'  'fontconfig' 'wayland' 'libx11' 'libxkbcommon-x11' 'libxi'
          'hicolor-icon-theme' 'libgl' 'libcanberra' 'dbus' 'lcms2')
-makedepends=('libxinerama' 'libxcursor' 'libxrandr' 'wayland-protocols' 'python-sphinx')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/kovidgoyal/$pkgname/archive/v$pkgver.tar.gz")
-sha512sums=('3cee1501c2787283654e0c48a6dd40a969d570003722dc0558d278b29a22df51d4e215d66cd74a417a08bff9beaf8cf69f594f34dab23647d9abdba831c9fb65')
+makedepends=('git' 'libxinerama' 'libxcursor' 'libxrandr' 'wayland-protocols' 'python-sphinx')
+source=("git+https://github.com/kovidgoyal/$pkgname.git#tag=v$pkgver?signed"
+        "https://github.com/kovidgoyal/kitty/commit/478553e.patch")
+validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal
+sha512sums=('SKIP'
+            '963301b774668e66fe18a954b2dc980adc82d3874c4f1df85c2bad642a7aec627e5032b4a5bcb26706270d9420e2d4c7e2d1ba934ae6439688ec62d19c477441')
+
+prepare() {
+  cd "$srcdir/$pkgname"
+  patch -Np1 < ../478553e.patch
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
   python3 setup.py linux-package --update-check-interval=0
 }
 
@@ -26,7 +34,7 @@ package_kitty() {
   depends+=('kitty-terminfo')
   optdepends=('imagemagick: viewing images with icat')
 
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname"
 
   cp -r linux-package "${pkgdir}"/usr
 
@@ -52,5 +60,5 @@ package_kitty-terminfo() {
   depends=('ncurses')
 
   mkdir -p "$pkgdir/usr/share/terminfo"
-  tic -x -o "$pkgdir/usr/share/terminfo" $pkgbase-$pkgver/terminfo/kitty.terminfo
+  tic -x -o "$pkgdir/usr/share/terminfo" $pkgbase/terminfo/kitty.terminfo
 }