diff --git a/utils/sh/extract_funcs.sh b/utils/sh/extract_funcs.sh
index a952c21a74e..76d743e1638 100644
--- a/utils/sh/extract_funcs.sh
+++ b/utils/sh/extract_funcs.sh
@@ -38,7 +38,7 @@ extract_distfiles()
 	local f=
 
 	[ -f $XBPS_EXTRACT_DONE ] && return 0
-	[ -z "$in_chroot" -a ! -O $XBPS_BUILDDIR ] && \
+	[ -z "$in_chroot" -a ! -w $XBPS_BUILDDIR ] && \
 		msg_error "can't extract distfile(s) (permission denied)"
 
 	#
diff --git a/utils/sh/stow_funcs.sh b/utils/sh/stow_funcs.sh
index a42872e4b54..a45fa76f8bc 100644
--- a/utils/sh/stow_funcs.sh
+++ b/utils/sh/stow_funcs.sh
@@ -98,7 +98,7 @@ unstow_pkg()
 	cd $XBPS_PKGMETADIR/$pkgname || exit 1
 	if [ ! -f flist ]; then
 		msg_error "$pkg is incomplete, missing flist."
-	elif [ ! -O flist ]; then
+	elif [ ! -w flist ]; then
 		msg_error "$pkg cannot be removed (permission denied)."
 	fi