diff --git a/abuild.in b/abuild.in
index 2ef68b8773640c3bdbe49bf70d9e10acf3360d01..b4a6d41124f0a6e49d77d2e5702c27754a8ead88 100644
--- a/abuild.in
+++ b/abuild.in
@@ -28,7 +28,6 @@ fi
 : ${APK:="apk"}
 : ${ADDUSER:="abuild-adduser"}
 : ${ADDGROUP:="abuild-addgroup"}
-: ${SETFATTR:="setfattr"}
 
 apk_opt_wait="--wait 30"
 doc_threshold=$((2 * 1024 * 1024)) # 2 MiB
@@ -2600,6 +2599,8 @@ stripbin() {
 	esac
 
 	msg "Stripping binaries"
+
+	mkdir "$pkgbasedir/.strip-tmp"
 	scanelf --recursive --nobanner --osabi --etype "ET_DYN,ET_EXEC" . \
 		| while read type osabi filename; do
 
@@ -2607,12 +2608,13 @@ stripbin() {
 		[ -e "$filename" ] || continue
 
 		[ "$osabi" != "STANDALONE" ] || continue
-		local XATTR=$(getfattr --match="" --dump "${filename}")
-		"${stripcmd}" "${filename}"
-		if [ -n "$XATTR" ]; then
-			echo "$XATTR" | "$SETFATTR" --restore=-
-		fi
+		local tmp="$pkgbasedir/.strip-tmp/${filename##*/}"
+		"${stripcmd}" -o "$tmp" "${filename}"
+		# only replace content to preserve attributes
+		cat "$tmp" > "$filename"
+		rm "$tmp"
 	done
+	rmdir "$pkgbasedir/.strip-tmp"
 }
 
 # simply list target apks
diff --git a/tests/abuild_test b/tests/abuild_test
index 91d037462a1fc1e152fcc9f6b81004ab0b35c05f..cc6aa86ed27ab678b5d6b4f67ead4c6cb6442f91 100755
--- a/tests/abuild_test
+++ b/tests/abuild_test
@@ -10,7 +10,6 @@ init_tests \
 	abuild_invalid_filename \
 	abuild_usr_lib64 \
 	abuild_dbg_subpackage \
-	abuild_SETFATTR_in_dbg \
 	abuild_reproducible \
 	abuild_checksum_generation \
 	abuild_checksum_duplicates \
@@ -238,16 +237,6 @@ abuild_dbg_subpackage_body() {
 	fi
 }
 
-abuild_SETFATTR_in_dbg_body() {
-	init_keys
-	cp -ra "$testrepo"/dbgpkg .
-	cd dbgpkg
-	SETFATTR=true atf_check -s exit:0 \
-		-o match:"hello world" \
-		-e match:"Build complete" \
-		abuild
-}
-
 abuild_reproducible_body() {
 	init_keys
 	cp -ra "$testrepo" .