diff --git a/src/auto/configure b/src/auto/configure
index 54c1aa8..9eca87c 100755
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -5279,7 +5279,7 @@
 printf "%s\n" "yes" >&6; }
 fi
 if test "$enable_smack" = "yes"; then
-  ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
+  ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
 if test "x$ac_cv_header_attr_xattr_h" = xyes
 then :
   true
@@ -5434,7 +5434,7 @@
 if test "$enable_xattr" = "yes"; then
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 printf "%s\n" "yes" >&6; }
-  ac_fn_c_check_header_compile "$LINENO" "attr/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
+  ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_attr_xattr_h" "$ac_includes_default"
 if test "x$ac_cv_header_attr_xattr_h" = xyes
 then :
   printf "%s\n" "#define HAVE_XATTR 1" >>confdefs.h
diff --git a/src/configure.ac b/src/configure.ac
index e21e234..4b2046d 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -480,7 +480,7 @@
   AC_MSG_RESULT(yes)
 fi
 if test "$enable_smack" = "yes"; then
-  AC_CHECK_HEADER([attr/xattr.h], true, enable_smack="no")
+  AC_CHECK_HEADER([sys/xattr.h], true, enable_smack="no")
 fi
 if test "$enable_smack" = "yes"; then
   AC_MSG_CHECKING(for XATTR_NAME_SMACKEXEC in linux/xattr.h)
@@ -520,7 +520,7 @@
 	, enable_xattr="yes")
 if test "$enable_xattr" = "yes"; then
   AC_MSG_RESULT(yes)
-  AC_CHECK_HEADER([attr/xattr.h], [AC_DEFINE(HAVE_XATTR)])
+  AC_CHECK_HEADER([sys/xattr.h], [AC_DEFINE(HAVE_XATTR)])
 else
   AC_MSG_RESULT(no)
 fi
diff --git a/src/os_unix.c b/src/os_unix.c
index 674dd96..50acd5a 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -36,12 +36,12 @@
 #endif
 
 #ifdef FEAT_XATTR
-# include <attr/xattr.h>
+# include <sys/xattr.h>
 # define XATTR_VAL_LEN 1024
 #endif
 
 #ifdef HAVE_SMACK
-# include <attr/xattr.h>
+# include <sys/xattr.h>
 # include <linux/xattr.h>
 # ifndef SMACK_LABEL_LEN
 #  define SMACK_LABEL_LEN 1024
diff --git a/src/testdir/test_writefile.vim b/src/testdir/test_writefile.vim
index a54efa7..3b0164e 100644
--- a/src/testdir/test_writefile.vim
+++ b/src/testdir/test_writefile.vim
@@ -979,6 +979,7 @@
 
 func Test_write_with_xattr_support()
   CheckLinux
+  CheckFeature xattr
   CheckExecutable setfattr
 
   let contents = ["file with xattrs", "line two"]
diff --git a/src/version.c b/src/version.c
index ffa5afc..f918ad8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1963,
+/**/
     1962,
 /**/
     1961,