diff --git a/src/Makefile b/src/Makefile
index 779a7dcf..cbf87b1b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-# @(#$Id: Makefile,v 1.15 2005-11-16 08:17:10 dockes Exp $  (C) 2005 J.F.Dockes
+# @(#$Id: Makefile,v 1.16 2005-11-21 16:04:49 dockes Exp $  (C) 2005 J.F.Dockes
 
 # Default values. These can be overridden on the command line ie: 
 # make PREFIX=/usr
@@ -26,8 +26,8 @@ static:
 	cd bincimapmime; ${MAKE}
 	cd index; rm -f recollindex; \
 	   ${MAKE} BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
-	cd qtgui; qmake recoll.pro; rm -f recoll \
-	   cat ../mk/sysconf Makefile | ${MAKE} -f - \
+	cd qtgui; qmake recoll.pro; rm -f recoll; \
+	   cat ../mk/sysconf ../mk/localdefs Makefile | ${MAKE} -f - \
 	       BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic
 
 clean:
diff --git a/src/makestaticdist.sh b/src/makestaticdist.sh
index ba82ce10..9c98361e 100644
--- a/src/makestaticdist.sh
+++ b/src/makestaticdist.sh
@@ -35,9 +35,9 @@ rm -f index/recollindex qtgui/recoll
 make static || exit 1
 strip index/recollindex qtgui/recoll
 
-files='COPYING README INSTALL recollinstall
+files="COPYING README INSTALL recollinstall
 filters sampleconf 
-index/recollindex qtgui/recoll'
+index/recollindex qtgui/recoll qtgui/mtpics/*.png"
 
 $TAR chf - $files  | (cd $topdir; $TAR xf -)
 (cd $targetdir ; \
diff --git a/src/recollinstall b/src/recollinstall
index 47f43175..b597e0d8 100755
--- a/src/recollinstall
+++ b/src/recollinstall
@@ -10,8 +10,8 @@ fatal()
 }
 usage()
 {
-    echo 'Usage (binaries): installrecoll <dir>, ie: installrecoll /usr/local'
-    fatal 'Usage (personal config): installrecoll'
+    echo 'Usage (common files): recollinstall <dir>, ie: recollinstall /usr/local'
+    fatal 'Usage (personal config): recollinstall'
 }
 
 INSTALL=${INSTALL:=install}
@@ -23,18 +23,28 @@ if test $# = 1 ; then
    echo "Installing to $PREFIX"
 
    test -x qtgui/recoll || fatal "qtgui/recoll does not exist." \
-        " You need to build first."
+        " You need to build first (type 'make')."
+
+   for d in ${PREFIX} \
+	    ${PREFIX}/bin \
+	    ${PREFIX}/share \
+	    ${PREFIX}/share/recoll \
+	    ${PREFIX}/share/recoll/examples \
+	    ${PREFIX}/share/recoll/images 
+   do
+     test -d $d || mkdir $d || exit 1
+   done
+
 
-   test -d ${PREFIX}/bin || mkdir ${PREFIX}/bin || exit 1
    ${INSTALL} qtgui/recoll index/recollindex recollinstall $PREFIX/bin \
 	      || exit 1
-   test -d ${PREFIX}/share || mkdir ${PREFIX}/share
-   test -d ${PREFIX}/share/examples || mkdir ${PREFIX}/share/examples
-   test -d ${PREFIX}/share/examples/recoll || \
-	mkdir ${PREFIX}/share/examples/recoll
-   ${INSTALL} filters/rcl* ${PREFIX}/share/examples/recoll || exit 1
+
+   ${INSTALL} filters/rcl* ${PREFIX}/share/recoll/examples/ || exit 1
+
    ${INSTALL} sampleconf/recoll.conf sampleconf/mimeconf sampleconf/mimemap \
-	      ${PREFIX}/share/examples/recoll || exit 1
+		    ${PREFIX}/share/recoll/examples/ || exit 1
+
+   ${INSTALL} qtgui/mtpics/*.png ${PREFIX}/share/recoll/images || exit 1
 
    exit 0