diff --git a/srcpkgs/android-tools/patches/include-sys-sysmacros.patch b/srcpkgs/android-tools/patches/include-sys-sysmacros.patch
new file mode 100644
index 00000000000..592473ac93f
--- /dev/null
+++ b/srcpkgs/android-tools/patches/include-sys-sysmacros.patch
@@ -0,0 +1,10 @@
+--- core/adb/client/usb_linux.cpp	2019-01-02 20:03:26.218600891 +0100
++++ -	2019-01-02 20:03:57.806149467 +0100
+@@ -28,6 +28,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/sysmacros.h>
+ #include <sys/ioctl.h>
+ #include <sys/time.h>
+ #include <sys/types.h>
diff --git a/srcpkgs/android-tools/patches/undef__USE_GNU.patch b/srcpkgs/android-tools/patches/undef__USE_GNU.patch
new file mode 100644
index 00000000000..03fb129c1c1
--- /dev/null
+++ b/srcpkgs/android-tools/patches/undef__USE_GNU.patch
@@ -0,0 +1,24 @@
+Source: John
+Upstream: No
+Reason: Conflicting declaration of copy_file_range on GLIBC
+
+FAILED: e2fsprogs/misc/create_inode.c.o 
+cc -std=gnu11 -D_FORTIFY_SOURCE=2 -mtune=generic -O2 -pipe     -Ie2fsprogs/lib -Ie2fsprogs/lib/ext2fs -Icore/libsparse/include -c e2fsprogs/misc/create_inode.c -o e2fsprogs/misc/create_inode.c.o
+e2fsprogs/misc/create_inode.c:406:18: error: conflicting types for 'copy_file_range'
+ static errcode_t copy_file_range(ext2_filsys fs, int fd, ext2_file_t e2_file,
+                  ^~~~~~~~~~~~~~~
+In file included from e2fsprogs/misc/create_inode.c:20:
+/usr/include/unistd.h:1107:9: note: previous declaration of 'copy_file_range' was here
+ ssize_t copy_file_range (int __infd, __off64_t *__pinoff,
+         ^~~~~~~~~~~~~~~
+
+--- e2fsprogs/misc/create_inode.c	2019-01-02 20:07:51.685424116 +0100
++++ -	2019-01-02 20:08:17.379127932 +0100
+@@ -17,6 +17,7 @@
+ #include <time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#undef __USE_GNU
+ #include <unistd.h>
+ #include <limits.h> /* for PATH_MAX */
+ #ifdef HAVE_ATTR_XATTR_H
diff --git a/srcpkgs/android-tools/template b/srcpkgs/android-tools/template
index 68361b8945f..30132456c06 100644
--- a/srcpkgs/android-tools/template
+++ b/srcpkgs/android-tools/template
@@ -3,7 +3,7 @@ pkgname=android-tools
 # NOTE: not all upstream updates has code changes for the parts
 #       of android used by android-tools. Check for diff with:
 #         curl -L http://git.io/vvC0Z | sh -s 5.0.2_r1 5.1.0_r1
-version=9.0.0r3
+version=9.0.0r21
 revision=1
 _distver=${version/r/_r}
 create_wrksrc=yes
@@ -22,10 +22,10 @@ distfiles="
  ${_baseurl}/external/e2fsprogs/+archive/android-${_distver}.tar.gz>e2fsprogs.tar.gz
  https://boringssl.googlesource.com/boringssl/+archive/3359.tar.gz>boringssl.tar.gz"
 # Contents checksums because the tarballs change with every download
-checksum="@6c4e5d93ef8d543a0d7f3a208cccc7b708176eb193352b0bbff6f53c6a7188df
- @9257b1a098c8012f154ed47795093e12040b562345a2ae889fc06db931fc5b0c
+checksum="@8799c86b9bdcfe3bf0fd47df41ba5e6df7f85b9cc57ba0ad297d5187766b900c
+ @6569cc9bf9d303c099070cfb3d0687ab839d3203e082a865a236de616062f75c
  @9f2b5e379eca4c56e2d422598831bfd7bdf2b7b3c3d011ce513c7603aa46b574
- @47b98c4ec5f037379b0b4e237d7cac87452ecf3aa7882114f7715a9995e959ad
+ @f1efc86a1e78521f4754d184d682c1f6660c04f74496913f37cae9e2670db0e8
  @e98509632e865e792dc4b344b0a1ada0662dda7571534fa7c5d1a8902dcfb0f4
  @9ec3dd8c7f6ec5f4d8b60e22d8dcba3dc4432763ec8a637c05ba24d3b58b2826"