diff --git a/lightdm/trunk/PKGBUILD b/lightdm/trunk/PKGBUILD
index cd60e452315..54462551520 100644
--- a/lightdm/trunk/PKGBUILD
+++ b/lightdm/trunk/PKGBUILD
@@ -7,20 +7,18 @@ pkgname=(
   liblightdm-qt5
 )
 pkgver=1.30.0
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc='A lightweight display manager'
 arch=(x86_64)
-url=https://www.freedesktop.org/wiki/Software/LightDM/
+url="https://github.com/canonical/lightdm"
 license=(
   GPL3
   LGPL3
 )
 makedepends=(
   glib2
-  git
   gobject-introspection
-  gtk-doc
   intltool
   itstool
   libgcrypt
@@ -35,7 +33,7 @@ makedepends=(
   yelp-tools
 )
 source=(
-  git+https://github.com/CanonicalLtd/lightdm.git#tag=${pkgver}
+  https://github.com/canonical/lightdm/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc}
   lightdm.service
   lightdm.sysusers
   lightdm.tmpfiles
@@ -45,7 +43,9 @@ source=(
   lightdm-default-config.patch
   Xsession
 )
-sha256sums=('SKIP'
+validpgpkeys=('497851B5D455C606543F2B9318EAA1890F7C882E') # Robert Ancell
+sha256sums=('a118779650a3a5b20f05d53c4f9e377b484fbc1810a6b0914a60840d9a581f95'
+            'SKIP'
             '0db37a14521be729411a767f157fbd07adb738b14006277def53a1efe4dacfb8'
             'fd93291bfc9985f0a1bb288472866aa0a9bcd259e024c3a29d20ca158bc08403'
             'cd69f928a1a5b30a30ba916e1b64c9f3657597cb28f3f0e220494d6e5e4bf587'
@@ -56,7 +56,7 @@ sha256sums=('SKIP'
             'd30321a1b490500483b8ed7825fcff2c24a7c760ac627789ff517693888ec3c5')
 
 prepare() {
-  cd lightdm
+  cd lightdm-${pkgver}
 
   patch -Np1 -i ../lightdm-default-config.patch
 
@@ -64,7 +64,7 @@ prepare() {
 }
 
 build() {
-  cd lightdm
+  cd lightdm-${pkgver}
 
   export MOC5=moc-qt5
 
@@ -76,7 +76,6 @@ build() {
     --sysconfdir=/etc \
     --disable-static \
     --disable-tests \
-    --enable-gtk-doc \
     --with-greeter-user=lightdm \
     --with-greeter-session=lightdm-gtk-greeter
   make
@@ -109,7 +108,7 @@ package_lightdm() {
     etc/pam.d/lightdm-greeter
   )
 
-  cd lightdm
+  cd lightdm-${pkgver}
 
   make DESTDIR="${pkgdir}" install
   make DESTDIR="${pkgdir}" -C liblightdm-qt uninstall
@@ -144,7 +143,7 @@ package_liblightdm-qt5() {
   )
   options=(!emptydirs)
 
-  cd lightdm
+  cd lightdm-${pkgver}
 
   make DESTDIR="${pkgdir}" -C liblightdm-gobject install
   make DESTDIR="${pkgdir}" -C liblightdm-qt install