diff --git a/tools/scripts/xabuild b/tools/scripts/xabuild
index 106e0311cb9..5e44de8cd39 100755
--- a/tools/scripts/xabuild
+++ b/tools/scripts/xabuild
@@ -41,6 +41,21 @@ if [ -z "$MSBUILD" ] ; then
 	MSBUILD=xbuild
 fi
 
+if [ -z "$CONFIGURATION" ]; then
+	for p in "$*"; do
+		case $p in
+			/property:Configuration=*|                                                   \
+			/p:Configuration=*|                                                          \
+			-p:Configuration=*|                                                          \
+			--property:Configuration=*) CONFIGURATION="`echo $p | cut -d '=' -f 2`" ;;
+		esac
+
+		if [ -n "$CONFIGURATION" ]; then
+			break
+		fi
+	done
+fi
+
 if [[ "$prefix" == */tools/scripts ]] ; then
 	Paths_targets="$prefix/../../build-tools/scripts/Paths.targets"
 	for c in "$CONFIGURATION" Debug Release ; do