Index: fsarchiver-0.6.23/src/oper_restore.c
===================================================================
--- fsarchiver-0.6.23.orig/src/oper_restore.c
+++ fsarchiver-0.6.23/src/oper_restore.c
@@ -19,12 +19,13 @@
 #  include "config.h"
 #endif
 
+#include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <assert.h>
 #include <string.h>
 #include <stdlib.h>
-#include <attr/xattr.h>
+#include <sys/xattr.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <gcrypt.h>
Index: fsarchiver-0.6.23/src/oper_save.c
===================================================================
--- fsarchiver-0.6.23.orig/src/oper_save.c
+++ fsarchiver-0.6.23/src/oper_save.c
@@ -29,7 +29,8 @@
 #include <sys/param.h>
 #include <sys/statvfs.h>
 #include <sys/stat.h>
-#include <attr/xattr.h>
+#include <errno.h>
+#include <sys/xattr.h>
 #include <zlib.h>
 #include <assert.h>
 #include <gcrypt.h>
@@ -59,6 +60,10 @@
 #include "error.h"
 #include "queue.h"
 
+#ifndef ENOATTR
+#define ENOATTR ENODATA
+#endif
+
 typedef struct s_savear
 {   carchwriter ai;
     cregmulti   regmulti;
Index: fsarchiver-0.6.23/configure.ac
===================================================================
--- fsarchiver-0.6.23.orig/configure.ac
+++ fsarchiver-0.6.23/configure.ac
@@ -88,7 +88,7 @@ PKG_CHECK_MODULES([BLKID], [blkid])
 PKG_CHECK_MODULES([UUID], [uuid])
 
 dnl Check for header files installed with a library
-AC_CHECK_HEADER([attr/xattr.h],, [AC_MSG_ERROR([attr/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])])
+AC_CHECK_HEADER([sys/xattr.h],, [AC_MSG_ERROR([sys/xattr.h not found. you may have to install a package called attr, libattr, libattr-devel])])
 
 dnl Check for standard header files.
 AC_CHECK_HEADERS([malloc.h unistd.h pthread.h])