diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 80b0da0..b884121 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -16,9 +16,19 @@ optdepends=('python2: for several of the commands (garchive, tragesym, xorn)'
             'imagemagick: png/pdf output'
             'graphviz: graph output')
 replaces=('geda-suite' 'geda-libs')
-source=(http://ftp.geda-project.org/geda-gaf/stable/v1.10/$pkgver/$pkgname-$pkgver.tar.gz)
+source=(http://ftp.geda-project.org/geda-gaf/stable/v1.10/$pkgver/$pkgname-$pkgver.tar.gz
+        geda-gaf-may-be-uninitialized.patch::https://repo.or.cz/geda-gaf.git/commitdiff_plain/e7cfde62980bd63c982d9a80e450588734a84c6c
+        geda-gaf-fno-common1.patch::https://repo.or.cz/geda-gaf.git/commitdiff_plain/cb6bac898fe43c5a59b577123ba8698ec04deef6
+        geda-gaf-fno-common2.patch::https://repo.or.cz/geda-gaf.git/commitdiff_plain/20aec04f904a89d251b9a1f9faf5c53a002a00f8
+        geda-gaf-fno-common3.patch::https://repo.or.cz/geda-gaf.git/commitdiff_plain/7b9d523a3558290b4487c3ff9a4a5b43e8941158
+        geda-gaf-format.patch::https://repo.or.cz/geda-gaf.git/commitdiff_plain/10161a66271ed47c79e0fc12933ed436baec7ca7)
 # signature was dropped in 1.10.0
-md5sums=('09f2558661b39e97170721a57b2d7b66')
+md5sums=('09f2558661b39e97170721a57b2d7b66'
+         'ca875ab4a84933ad9d33298ae31092cd'
+         '61c720b3b5056184dcce96118a8c2c46'
+         'd38d6927245a086c0c4cfbef2cecd099'
+         '02923408939975b37608a11b8600221a'
+         'eca1589f6fc459c3fbe4008930ab7c75')
 validpgpkeys=('6073BA0D62E91251C421C17067B19BABB83BBE9A')
 
 # 1.10.0 adds an optional dep on libfam/libgamin (prefers gamin?)
@@ -26,6 +36,11 @@ validpgpkeys=('6073BA0D62E91251C421C17067B19BABB83BBE9A')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver/"
+  patch -p1 -i ../geda-gaf-may-be-uninitialized.patch
+  patch -p1 -i ../geda-gaf-fno-common1.patch
+  patch -p1 -i ../geda-gaf-fno-common2.patch
+  patch -p1 -i ../geda-gaf-fno-common3.patch
+  patch -p1 -i ../geda-gaf-format.patch
   # gamin's optional-ness is overstated
   sed -i 's|^.*<fam.h>|//&|' gschem/src/gschem_change_notification.c
   sed -i 's| enum FAMCodes | int |' gschem/src/gschem_change_notification.c
@@ -33,8 +48,9 @@ prepare() {
 
 build () {
   cd "$srcdir/$pkgname-$pkgver/"
-  #CFLAGS+=' -Wno-deprecated-declarations'
+  CFLAGS+=' -Wno-deprecated-declarations'
   ./configure --prefix=/usr --disable-update-xdg-database --without-libfam
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool xorn/libtool
   make
 }