diff --git a/abuild.in b/abuild.in
index 655c1a97fd49ac34bd151050ac4e4e77d29df6ff..3e7ffafbbcf989a53c16a474ab8cc5416959e45b 100644
--- a/abuild.in
+++ b/abuild.in
@@ -1136,7 +1136,7 @@ create_apks() {
 			touch .dummy
 			set -- .dummy
 		fi
-		tar -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
+		tar --xattrs -c "$@" | abuild-tar --hash | gzip -9 >"$dir"/data.tar.gz
 
 		msg "Create checksum..."
 		# append the hash for data.tar.gz
@@ -1678,7 +1678,11 @@ stripbin() {
 	msg "Stripping binaries"
 	scanelf --recursive --nobanner --etype "ET_DYN,ET_EXEC" . \
 		| sed -e 's:^ET_DYN ::' -e 's:^ET_EXEC ::' \
-		| xargs -r ${CROSS_COMPILE}strip
+		| while read filename; do
+		XATTR=$(getfattr -d "${filename}")
+		${CROSS_COMPILE}strip "${filename}"
+		[ -n "$XATTR" ] && (echo "$XATTR" | setfattr --restore=-)
+	done
 }
 
 # simply list target apks