diff --git a/lib/libpacman/po/Makevars b/lib/libpacman/po/Makevars
diff --git a/scripts/makepkg b/scripts/makepkg
index 9979b8c..bd64d72 100755
--- a/scripts/makepkg
+++ b/scripts/makepkg
@@ -1314,7 +1314,7 @@ for netfile in "${source[@]}" "${signatures[@]}"; do
 done
 
 if [ "$GENSHA1" = "0" ]; then
-	if [ "$NOEXTRACT" = "1" ]; then
+	if [ "$NOEXTRACT" = "1" -o "`check_option NOEXTRACT`" ]; then
 		warning "Skipping source extraction       -- using existing src/ tree"
 		warning "Skipping source integrity checks -- using existing src/ tree"
 	else
diff --git a/src/pacman-g2/po/Makevars b/src/pacman-g2/po/Makevars