diff --git a/compile.sh b/compile.sh
index 9cfb834c..580f1c10 100755
--- a/compile.sh
+++ b/compile.sh
@@ -19,6 +19,14 @@ else
     crosscompile_target=$1
     TESTDISKCC=$crosscompile_target-gcc
     PKG_CONFIG_PATH=/usr/$crosscompile_target/lib/pkgconfig
+    if [ ! -d $PKG_CONFIG_PATH ];
+    then
+      PKG_CONFIG_PATH=/usr/$crosscompile_target/sys-root/mingw/lib/pkgconfig
+    fi
+    if [ ! -d $PKG_CONFIG_PATH ];
+    then
+      unset PKG_CONFIG_PATH
+    fi
     export PKG_CONFIG_PATH
   fi
 fi
diff --git a/configure.ac b/configure.ac
index 1a86fb01..e1c707b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -777,7 +777,10 @@ if test "$use_qt" = "true";
 then
   PKG_CHECK_MODULES(QTCORE, QtCore >= 4.0.1)
   PKG_CHECK_MODULES(QTGUI,  QtGui  >= 4.0.1)
-  MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+  AC_CHECK_TOOLS(MOC,[moc-qt4 moc],)
+  if test x$MOC = x ; then
+	AC_MSG_WARN(Could not find a moc-qt4 or moc tool in your PATH.)
+  fi 
   qphotorec_LDADD="$qphotorec_LDADD $QTGUI_LIBS"
   CXXFLAGS="$CXXFLAGS $QTCORE_CFLAGS $QTGUI_CFLAGS"
 fi