diff --git a/disabled-packages/attr/build.sh b/disabled-packages/attr/build.sh
index e98e6e4bc..b7185354e 100644
--- a/disabled-packages/attr/build.sh
+++ b/disabled-packages/attr/build.sh
@@ -1,3 +1,5 @@
+# Package disabled - does Android support setting extended file attributes?
+# I'm getting 'Operation not supported on transport endpoint' on all tests.
 TERMUX_PKG_HOMEPAGE=http://savannah.nongnu.org/projects/attr/
 TERMUX_PKG_DESCRIPTION="Commands for manipulating filesystem extended attributes."
 TERMUX_PKG_VERSION=2.4.47
@@ -6,5 +8,3 @@ TERMUX_PKG_FOLDERNAME=attr-$TERMUX_PKG_VERSION
 TERMUX_PKG_BUILD_IN_SRC=yes
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-gettext=no"
 TERMUX_PKG_MAKE_INSTALL_TARGET="install install-lib"
-
-CPPFLAGS+=" -D__THROW="
diff --git a/disabled-packages/attr/include-xattr.h.patch b/disabled-packages/attr/include-xattr.h.patch
new file mode 100644
index 000000000..6d41836b7
--- /dev/null
+++ b/disabled-packages/attr/include-xattr.h.patch
@@ -0,0 +1,45 @@
+diff -u -r ../attr-2.4.47/include/xattr.h ./include/xattr.h
+--- ../attr-2.4.47/include/xattr.h	2013-05-19 00:53:54.000000000 -0400
++++ ./include/xattr.h	2016-09-09 09:29:40.387825768 -0400
+@@ -34,29 +34,29 @@
+ __BEGIN_DECLS
+ 
+ extern int setxattr (const char *__path, const char *__name,
+-		      const void *__value, size_t __size, int __flags) __THROW;
++		      const void *__value, size_t __size, int __flags);
+ extern int lsetxattr (const char *__path, const char *__name,
+-		      const void *__value, size_t __size, int __flags) __THROW;
++		      const void *__value, size_t __size, int __flags);
+ extern int fsetxattr (int __filedes, const char *__name,
+-		      const void *__value, size_t __size, int __flags) __THROW;
++		      const void *__value, size_t __size, int __flags);
+ 
+ extern ssize_t getxattr (const char *__path, const char *__name,
+-				void *__value, size_t __size) __THROW;
++				void *__value, size_t __size);
+ extern ssize_t lgetxattr (const char *__path, const char *__name,
+-				void *__value, size_t __size) __THROW;
++				void *__value, size_t __size);
+ extern ssize_t fgetxattr (int __filedes, const char *__name,
+-				void *__value, size_t __size) __THROW;
++				void *__value, size_t __size);
+ 
+ extern ssize_t listxattr (const char *__path, char *__list,
+-				size_t __size) __THROW;
++				size_t __size);
+ extern ssize_t llistxattr (const char *__path, char *__list,
+-				size_t __size) __THROW;
++				size_t __size);
+ extern ssize_t flistxattr (int __filedes, char *__list,
+-				size_t __size) __THROW;
++				size_t __size);
+ 
+-extern int removexattr (const char *__path, const char *__name) __THROW;
+-extern int lremovexattr (const char *__path, const char *__name) __THROW;
+-extern int fremovexattr (int __filedes,   const char *__name) __THROW;
++extern int removexattr (const char *__path, const char *__name);
++extern int lremovexattr (const char *__path, const char *__name);
++extern int fremovexattr (int __filedes,   const char *__name);
+ 
+ __END_DECLS
+