diff --git a/qb/qb.comp.sh b/qb/qb.comp.sh
index 72fbb7d599..d94112aa99 100644
--- a/qb/qb.comp.sh
+++ b/qb/qb.comp.sh
@@ -6,15 +6,26 @@ TEMP_EXE=.tmp
 
 ECHOBUF="Checking operating system"
 #echo -n "Checking operating system"
-case "$(uname)" in
-	'Linux') OS='Linux';;
-	*'BSD') OS='BSD';;
-	'Darwin') OS='Darwin';;
-	'MINGW32'*) OS='MinGW';;
-	'CYGWIN'*) OS='Cygwin';;
-	'Haiku') OS='Haiku';;
-	*) OS="Win32";;
-esac
+
+if [ -n "$CROSS_COMPILE" ]; then
+	case "$CROSS_COMPILE" in
+		*'-mingw32'*) OS='Win32';;
+		*);;
+	esac
+fi
+
+if [ -z "$OS" ]; then
+	case "$(uname)" in
+		'Linux') OS='Linux';;
+		*'BSD') OS='BSD';;
+		'Darwin') OS='Darwin';;
+		'MINGW32'*) OS='MinGW';;
+		'CYGWIN'*) OS='Cygwin';;
+		'Haiku') OS='Haiku';;
+		*) OS="Win32";;
+	esac
+fi
+
 echo "$ECHOBUF ... $OS"
 
 # Checking for working C compiler
diff --git a/qb/qb.libs.sh b/qb/qb.libs.sh
index c91b54350e..086a108103 100644
--- a/qb/qb.libs.sh
+++ b/qb/qb.libs.sh
@@ -103,7 +103,7 @@ check_pkgconf()	#$1 = HAVE_$1	$2 = package	$3 = version	$4 = critical error mess
 	[ "$PKG_CONF_PATH" ] || {
 		ECHOBUF="Checking for pkg-config"
 #		echo -n "Checking for pkg-config"
-		for PKG_CONF_PATH in $(which pkg-config) ''; do [ "$PKG_CONF_PATH" ] && break; done
+		for PKG_CONF_PATH in $(which "${CROSS_COMPILE}pkg-config") ''; do [ "$PKG_CONF_PATH" ] && break; done
 		[ "$PKG_CONF_PATH" ] || { echo "pkg-config not found. Exiting ..."; exit 1;}
 		echo "$ECHOBUF ... $PKG_CONF_PATH"
 	}