diff --git a/xbps-src b/xbps-src
index e91bc67a0f..1d47c94ee7 100755
--- a/xbps-src
+++ b/xbps-src
@@ -408,8 +408,12 @@ export XBPS_MACHINE=$(xbps-uhelper arch)
 # main()
 #
 XBPS_OPTIONS=
+XBPS_OPTSTRING="a:CEfgGhH:Ij:Lm:No:r:tV"
 
-while getopts "a:CEfgGhH:Ij:Lm:No:r:tV" opt; do
+# Preprocess arguments in order to allow options before and after XBPS_TARGET.
+eval set -- $(getopt -- "$XBPS_OPTSTRING" "$@");
+
+while getopts "$XBPS_OPTSTRING" opt; do
     case $opt in
         a) readonly XBPS_CROSS_BUILD="$OPTARG"; XBPS_OPTIONS+=" -a $OPTARG";;
         C) readonly XBPS_KEEP_ALL=1; XBPS_OPTIONS+=" -C";;