diff --git a/src/configure b/src/configure
index 7fcc657b..8fa0c57a 100755
--- a/src/configure
+++ b/src/configure
@@ -1283,7 +1283,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 sys=`uname`
 if test -f mk/$sys ; then
-    (cd mk; test -f sysconf || ln -s $sys sysconf)
+    (cd mk; rm -f sysconf; ln -s $sys sysconf)
 else
    cat <<EOF
     No system configuration file found in mk/ for '$sys'. Maybe you
@@ -2283,22 +2283,21 @@ fi
 CPPFLAGS="$CPPFLAGS $INCICONV"
 echo "$as_me:$LINENO: checking for type of inbuf parameter to iconv" >&5
 echo $ECHO_N "checking for type of inbuf parameter to iconv... $ECHO_C" >&6
-if test "x$rcl_iconv_inbuf_const" = "x"; then
-   cat >conftest.$ac_ext <<_ACEOF
+cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 
-       #include <stddef.h>
-       #include <iconv.h>
+    #include <stddef.h>
+    #include <iconv.h>
 
 int
 main ()
 {
 
-       iconv(0,(const char **)0,(size_t *)0,(char **)0,(size_t *)0);
+    iconv(0,(const char **)0,(size_t *)0,(char **)0,(size_t *)0);
 
   ;
   return 0;
@@ -2334,7 +2333,6 @@ sed 's/^/| /' conftest.$ac_ext >&5
 rcl_iconv_inbuf_const="0"
 fi
 rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
 if test X$rcl_iconv_inbuf_const = X1 ; then
 
 cat >>confdefs.h <<\_ACEOF
@@ -2343,8 +2341,6 @@ _ACEOF
 
 fi
 
-echo   rcl_iconv_inbuf_const $rcl_iconv_inbuf_const
-
 #### Look for Xapian
 # Extract the first word of "xapian-config", so it can be a program name with args.
 set dummy xapian-config; ac_word=$2
@@ -2440,6 +2436,18 @@ if test X$QTDIR != X ; then
    export PATH
 fi
 
+# MacosX stuff: we don't support this (the native search tool is more than
+# good enough), but we make things work just enough so that the program can
+# be compiled and roughly installed (not as a .app, but to /usr/local),
+# basically to enable using a Macbook for development
+if test X$sys = XDarwin ; then
+   # The defaults tends to be macx-xcode, which we cant use
+    QMAKESPEC=macx-g++
+    export QMAKESPEC
+    #QMAKESPEC_SPEC="-spec max-g++"
+    #AC_SUBST(QMAKESPEC_SPEC)
+fi
+
 # Extract the first word of "qmake", so it can be a program name with args.
 set dummy qmake; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -2488,6 +2496,10 @@ qt development files and tools and/or set the QTDIR environment variable?" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+if test X$sys = XDarwin ; then
+   QMAKE="${QMAKE} -spec macx-g++"
+fi
+
 # Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
 # depend on this. We try to detect the qt 4 version string instead.
 qmakevers="`qmake --version 2>&1`"
@@ -2509,6 +2521,7 @@ cd $QTGUI
 test -f uifrom3 && make -f uifrom3
 test -f recoll.pro && chmod +w recoll.pro
 cp recoll.pro.in recoll.pro
+echo QMAKE ${QMAKE}
 ${QMAKE} recoll.pro
 if test $? != 0 ; then
    { { echo "$as_me:$LINENO: error: Cannot use qmake to generate a Makefile. Maybe you need to
diff --git a/src/configure.ac b/src/configure.ac
index c781840d..af4c6fb3 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR(index/recollindex.cpp)
 
 sys=`uname`
 if test -f mk/$sys ; then
-    (cd mk; test -f sysconf || ln -s $sys sysconf)
+    (cd mk; rm -f sysconf; ln -s $sys sysconf)
 else
    cat <<EOF
     No system configuration file found in mk/ for '$sys'. Maybe you
@@ -208,12 +208,28 @@ if test X$QTDIR != X ; then
    export PATH
 fi
 
+# MacosX stuff: we don't support this (the native search tool is more than
+# good enough), but we make things work just enough so that the program can
+# be compiled and roughly installed (not as a .app, but to /usr/local),
+# basically to enable using a Macbook for development
+if test X$sys = XDarwin ; then
+   # The defaults tends to be macx-xcode, which we cant use
+    QMAKESPEC=macx-g++
+    export QMAKESPEC
+    #QMAKESPEC_SPEC="-spec max-g++"
+    #AC_SUBST(QMAKESPEC_SPEC)
+fi
+
 AC_PATH_PROG([QMAKE], [qmake], NOTFOUND)
 if test X$QMAKE = XNOTFOUND ; then 
    AC_MSG_ERROR([Cannot find the qmake program. Maybe you need to install
 qt development files and tools and/or set the QTDIR environment variable?])
 fi
 
+if test X$sys = XDarwin ; then
+   QMAKE="${QMAKE} -spec macx-g++"
+fi
+
 # Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
 # depend on this. We try to detect the qt 4 version string instead.
 qmakevers="`qmake --version 2>&1`"
@@ -233,6 +249,7 @@ cd $QTGUI
 test -f uifrom3 && make -f uifrom3
 test -f recoll.pro && chmod +w recoll.pro
 cp recoll.pro.in recoll.pro
+echo QMAKE ${QMAKE}
 ${QMAKE} recoll.pro
 if test $? != 0 ; then
    AC_MSG_ERROR([Cannot use qmake to generate a Makefile. Maybe you need to
diff --git a/src/mk/Darwin b/src/mk/Darwin
index 06dd6b5e..49f5cd46 100644
--- a/src/mk/Darwin
+++ b/src/mk/Darwin
@@ -4,7 +4,8 @@ include $(depth)/mk/localdefs
 ALL_CXXFLAGS = $(CXXFLAGS) $(COMMONCXXFLAGS) $(LOCALCXXFLAGS) \
            -DPUTENV_ARG_NOT_CONST \
 	   -DHAVE_VASPRINTF=1 \
-	   -DHAVE_MKDTEMP=1
+	   -DHAVE_MKDTEMP=1 \
+	   -DSTATFS_INCLUDE="<sys/mount.h>"
 
 RANLIB = ranlib
 LIBSYS = 
diff --git a/src/qtgui/reslist.cpp b/src/qtgui/reslist.cpp
index 3770d3a2..c4fadc1f 100644
--- a/src/qtgui/reslist.cpp
+++ b/src/qtgui/reslist.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: reslist.cpp,v 1.28 2007-06-25 10:13:40 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: reslist.cpp,v 1.29 2007-06-26 16:08:47 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <time.h>
@@ -20,7 +20,9 @@ static char rcsid[] = "@(#$Id: reslist.cpp,v 1.28 2007-06-25 10:13:40 dockes Exp
 #if (QT_VERSION < 0x040000)
 #include <qpopupmenu.h>
 #else
+#ifndef __APPLE__
 #include <qx11info_x11.h>
+#endif
 #include <q3popupmenu.h>
 #include <q3stylesheet.h>
 #include <q3mimefactory.h>
@@ -91,8 +93,10 @@ void ResList::resetSearch()
 #if (QT_VERSION < 0x040000)
     XFlush(qt_xdisplay());
 #else
+#ifndef __APPLE__
     XFlush(QX11Info::display());
 #endif
+#endif
 
 }
 
diff --git a/src/recollinstall.in b/src/recollinstall.in
index 2b80e1d7..9e7d9826 100755
--- a/src/recollinstall.in
+++ b/src/recollinstall.in
@@ -45,7 +45,14 @@ echo "Installing to $PREFIX"
 INSTALL=${INSTALL:="install -c"}
 STRIP=${STRIP:=strip}
 
-test -x ${QTGUI}/recoll || fatal "${QTGUI}/recoll does not exist." \
+sys=`uname`
+if test "$sys" = Darwin ; then
+    RECOLLPROG=${QTGUI}/recoll.app/Contents/MacOS/recoll
+else
+    RECOLLPROG=${QTGUI}/recoll
+fi
+
+test -x ${RECOLLPROG} || fatal "${QTGUI}/recoll does not exist." \
      " You need to build first (type 'make')."
 
 for d in \
@@ -78,7 +85,7 @@ ${INSTALL} -m 0444 doc/user/usermanual.html doc/user/docbook.css \
 ${INSTALL} -m 0444 doc/man/recoll.1 doc/man/recollindex.1 ${mandir}/man1/
 ${INSTALL} -m 0444 doc/man/recoll.conf.5  ${mandir}/man5/
 
-${INSTALL} -m 0755 ${QTGUI}/recoll index/recollindex ${bindir} || exit 1
+${INSTALL} -m 0755 ${RECOLLPROG} index/recollindex ${bindir} || exit 1
 ${STRIP} ${bindir}/recoll ${bindir}/recollindex
 
 ${INSTALL} -m 0755 filters/rcl* ${datadir}/recoll/filters/ || exit 1