diff --git a/bleachbit/trunk/PKGBUILD b/bleachbit/trunk/PKGBUILD
index 0b7ffde9ded..f7c067f60c8 100644
--- a/bleachbit/trunk/PKGBUILD
+++ b/bleachbit/trunk/PKGBUILD
@@ -8,23 +8,24 @@
 
 pkgname=bleachbit
 pkgver=4.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Deletes unneeded files to free disk space and maintain privacy'
 arch=(any)
 url='https://www.bleachbit.org/'
 license=(GPL3)
 depends=(python-gobject gtk3)
-source=(https://download.bleachbit.org/$pkgname-$pkgver.tar.bz2
+source=(git+https://github.com/bleachbit/bleachbit.git#tag=v${pkgver}?signed
         maximize-infinite-loop.patch::"https://github.com/bleachbit/bleachbit/commit/933ea605.patch")
-sha256sums=('34dedf9d1f7545bcf039c309f9a8e2b06b71d2a44d27fcf675abd194a981c3b6'
+validpgpkeys=(A9E582E4054A159315EDC943D6D447B02B4D4C9D) # Andrew Ziem
+sha256sums=('SKIP'
             '005f9e4ab4c1ed39379b0e02a9e15c2a92083a912f85447fef9701b2ffd33466')
 
 prepare() {
-  patch -d $pkgname-$pkgver -p1 -i ../maximize-infinite-loop.patch # Fix infinite loop with maximized window
+  patch -d $pkgname -p1 -i ../maximize-infinite-loop.patch # Fix infinite loop with maximized window
 }
 
 package() {
-  cd $pkgname-$pkgver
+  cd $pkgname
 
   make prefix=/usr DESTDIR="$pkgdir" install
 }