diff --git a/src/Makefile.in b/src/Makefile.in
index 66a6d251..cce22455 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# @(#$Id: Makefile.in,v 1.3 2006-02-02 08:35:17 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile.in,v 1.4 2006-02-21 12:56:55 dockes Exp $  (C) 2005 J.F.Dockes
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -7,12 +7,13 @@ bindir = @bindir@
 datadir = @datadir@
 mandir = @mandir@
 
+QMAKE = @QMAKE@
+
 all: mk/sysconf common/rclversion.h
 	cd lib; ${MAKE}
 	cd bincimapmime; ${MAKE}
 	cd index; ${MAKE} recollindex
-	cd qtgui; PATH=${PATH}:${QTDIR}/bin; export PATH; qmake recoll.pro; \
-	  ${MAKE} depth=.. 
+	cd qtgui; ${QMAKE} recoll.pro; ${MAKE} depth=.. 
 
 mk/sysconf:
 	@echo "You need to run configure first" ; exit 1
@@ -26,7 +27,7 @@ static:
 	cd bincimapmime; ${MAKE}
 	cd index; rm -f recollindex; \
 	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic recollindex
-	cd qtgui; PATH=${PATH}:${QTDIR}/bin; export PATH; qmake recoll.pro; \
+	cd qtgui; $(QMAKE) recoll.pro; \
 	   rm -f recoll; \
 	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic depth=.. 
 
diff --git a/src/configure b/src/configure
index 360c355a..28b5a1c0 100755
--- a/src/configure
+++ b/src/configure
@@ -2313,6 +2313,7 @@ QTRECOLL_DATADIR=${m_datadir}/recoll
 
 
 
+
 ac_config_files="$ac_config_files mk/localdefs"
 
 ac_config_files="$ac_config_files recollinstall"
diff --git a/src/configure.ac b/src/configure.ac
index 12c095a1..601051dc 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -135,6 +135,7 @@ AC_SUBST(XAPIANCXXFLAGS)
 AC_SUBST(LIBICONV)
 AC_SUBST(INCICONV)
 AC_SUBST(QTRECOLL_DATADIR)
+AC_SUBST(QMAKE)
 
 AC_CONFIG_FILES(mk/localdefs)
 AC_CONFIG_FILES(recollinstall)