diff --git a/src/excludefile b/src/excludefile
index ef966c33..3145abc1 100644
--- a/src/excludefile
+++ b/src/excludefile
@@ -21,6 +21,7 @@ kde/recoll_applet
 lib/librcl.a
 makesrcdist.sh
 mk/localdefs
+mk/manifest.txt
 qtgui/Makefile
 qtgui/preview/Makefile
 qtgui/preview/preview.pro
diff --git a/src/makesrcdist.sh b/src/makesrcdist.sh
index ce420790..3dbd95e1 100644
--- a/src/makesrcdist.sh
+++ b/src/makesrcdist.sh
@@ -2,11 +2,24 @@
 # @(#$Id: makesrcdist.sh,v 1.16 2008-11-21 16:43:42 dockes Exp $  (C) 2005 J.F.Dockes
 # A shell-script to make a recoll source distribution
 
-fatal()
-{
-	echo $*
-	exit 1
+fatal() {
+    echo $*
+    exit 1
 }
+tagtopsvn() {
+    (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \
+    	|| fatal tag failed
+}
+tagtophg() {
+    hg tag -m "Release $version tagged" $1 || fatal tag failed
+}
+tagexists() {
+    hg tags | cut -d' ' -f 1 | egrep '^'$1'$'
+}
+tagtop() {
+    tagtophg $*
+}
+
 #set -x
 
 TAR=/usr/bin/tar
@@ -16,33 +29,27 @@ TAR=/usr/bin/tar
 
 VCCMD=hg
 
+if test ! -d qtgui;then
+    echo "Should be executed in the master recoll directory"
+    exit 1
+fi
+
 version=`cat VERSION`
 versionforcvs=`echo $version | sed -e 's/\./_/g'`
+TAG="RECOLL_$versionforcvs"
+
+echo Creating version $versionforcvs
+sleep 2
+tagexists $TAG  && fatal "Tag $TAG already exists"
 
 editedfiles=`$VCCMD status . | egrep -v '^\?'`
 if test ! -z "$editedfiles"; then
 	fatal  "Edited files exist: " $editedfiles
 fi
 
-tagtopsvn() {
-    (cd ..; svn copy -m "Release $version tagged" . $SVNREPOS/tags/$1) \
-    	|| fatal tag failed
-}
-tagtophg() {
-    hg tag -f -m "Release $version tagged" $1 || fatal tag failed
-}
-tagtop() {
-    tagtophg $*
-}
-
 targetdir=${targetdir-/tmp}
 dotag=${dotag-yes}
 
-if test ! -d qtgui;then
-    echo "Should be executed in the master recoll directory"
-    exit 1
-fi
-
 case $version in
 *.*.*) releasename=recoll-$version;;
 *) releasename=betarecoll-$version;;
@@ -106,11 +113,6 @@ sed -e '/\.\/index\.html/d' -e '/\.\/book\.html/d' \
 diff $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html
 mv -f $topdir/doc/user/u1.html $topdir/doc/user/usermanual.html
 
-# We tag .. as there is the 'packaging/' directory in there
-TAG="RECOLL_$versionforcvs"
-#[ $dotag = "yes" ] && (cd ..;cvs tag -F $CVSTAG .)
-[ $dotag = "yes" ] && tagtop $TAG
-
 # Can't now put ./Makefile in excludefile, gets ignored everywhere. So delete
 # the top Makefile here (its' output by configure on the target system):
 rm -f $topdir/Makefile
@@ -120,3 +122,10 @@ out=$releasename.tar.gz
     $TAR chf - $releasename | \
     	gzip > $out)
 echo "$targetdir/$out created"
+
+# Check manifest against current reference
+tar tzf $targetdir/$out | sort | cut -d / -f 2- | \
+    diff mk/manifest.txt - || fatal "Please fix file list"
+
+# We tag .. as there is the 'packaging/' directory in there
+[ $dotag = "yes" ] && tagtop $TAG
diff --git a/src/mk/manifest.txt b/src/mk/manifest.txt
new file mode 100644
index 00000000..f7982dc3
--- /dev/null
+++ b/src/mk/manifest.txt
@@ -0,0 +1,461 @@
+
+COPYING
+ChangeLog
+INSTALL
+Makefile.in
+README
+VERSION
+aspell/
+aspell/Makefile
+aspell/aspell-local.h
+aspell/rclaspell.cpp
+aspell/rclaspell.h
+bincimapmime/
+bincimapmime/00README.recoll
+bincimapmime/AUTHORS
+bincimapmime/COPYING
+bincimapmime/Makefile
+bincimapmime/address.cc
+bincimapmime/address.h
+bincimapmime/config.h
+bincimapmime/convert.cc
+bincimapmime/convert.h
+bincimapmime/iodevice.cc
+bincimapmime/iodevice.h
+bincimapmime/iofactory.cc
+bincimapmime/iofactory.h
+bincimapmime/mime-getpart.cc
+bincimapmime/mime-inputsource.h
+bincimapmime/mime-parsefull.cc
+bincimapmime/mime-parseonlyheader.cc
+bincimapmime/mime-printbody.cc
+bincimapmime/mime-printdoc.cc
+bincimapmime/mime-printheader.cc
+bincimapmime/mime-utils.h
+bincimapmime/mime.cc
+bincimapmime/mime.h
+bincimapmime/trbinc.cc
+common/
+common/Makefile
+common/autoconfig.h.in
+common/rclconfig.cpp
+common/rclconfig.h
+common/rclinit.cpp
+common/rclinit.h
+common/textsplit.cpp
+common/textsplit.h
+common/unacpp.cpp
+common/unacpp.h
+common/uproplist.h
+configure
+configure.ac
+desktop/
+desktop/recoll-searchgui.desktop
+desktop/recoll.png
+desktop/recoll.xcf
+desktop/xdg-utils-1.0.1/
+desktop/xdg-utils-1.0.1/LICENSE
+desktop/xdg-utils-1.0.1/scripts/
+desktop/xdg-utils-1.0.1/scripts/xdg-desktop-menu
+desktop/xdg-utils-1.0.1/scripts/xdg-icon-resource
+desktop/xdg-utils-1.0.1/scripts/xdg-open
+doc/
+doc/man/
+doc/man/recoll.1
+doc/man/recoll.conf.5
+doc/man/recollindex.1
+doc/man/recollq.1
+doc/prog/
+doc/prog/Doxyfile
+doc/prog/Makefile
+doc/prog/filters.txt
+doc/prog/top.txt
+doc/user/
+doc/user/HTML.manifest
+doc/user/Makefile
+doc/user/bldloop
+doc/user/docbook.css
+doc/user/index.html
+doc/user/rcl.indexing.beaglequeue.html
+doc/user/rcl.indexing.config.html
+doc/user/rcl.indexing.html
+doc/user/rcl.indexing.monitor.html
+doc/user/rcl.indexing.periodic.html
+doc/user/rcl.indexing.storage.html
+doc/user/rcl.install.building.html
+doc/user/rcl.install.config.html
+doc/user/rcl.install.external.html
+doc/user/rcl.install.html
+doc/user/rcl.introduction.html
+doc/user/rcl.introduction.recoll.html
+doc/user/rcl.introduction.search.html
+doc/user/rcl.kicker-applet.html
+doc/user/rcl.program.api.html
+doc/user/rcl.program.fields.html
+doc/user/rcl.program.html
+doc/user/rcl.search.complex.html
+doc/user/rcl.search.custom.html
+doc/user/rcl.search.history.html
+doc/user/rcl.search.html
+doc/user/rcl.search.lang.html
+doc/user/rcl.search.multidb.html
+doc/user/rcl.search.preview.html
+doc/user/rcl.search.reslist.html
+doc/user/rcl.search.sort.html
+doc/user/rcl.search.termexplorer.html
+doc/user/rcl.search.tips.html
+doc/user/rcl.search.wildcards.html
+doc/user/rcl.searchkcl.html
+doc/user/rcl.searchkio.html
+doc/user/rcl.searchkio.searchabledocs.html
+doc/user/usermanual-italian.html
+doc/user/usermanual.html
+doc/user/usermanual.html-text
+doc/user/usermanual.sgml
+doc/user/usermanual.txt
+filters/
+filters/injectcommon.sh
+filters/rclabw
+filters/rclchm
+filters/rcldjvu
+filters/rcldoc
+filters/rcldvi
+filters/rclexecm.py
+filters/rclflac
+filters/rclgaim
+filters/rclics
+filters/rclid3
+filters/rclimg
+filters/rclkwd
+filters/rcllyx
+filters/rclman
+filters/rclogg
+filters/rclopxml
+filters/rclpdf
+filters/rclppt
+filters/rclps
+filters/rclpurple
+filters/rclpython
+filters/rclrtf
+filters/rclscribus
+filters/rclsiduxman
+filters/rclsoff
+filters/rclsvg
+filters/rcltex
+filters/rcltext
+filters/rcluncomp
+filters/rclwpd
+filters/rclxls
+filters/rclzip
+filters/recfiltcommon
+index/
+index/Makefile
+index/beaglequeue.cpp
+index/beaglequeue.h
+index/csguess.cpp
+index/csguess.h
+index/fsindexer.cpp
+index/fsindexer.h
+index/indexer.cpp
+index/indexer.h
+index/mimetype.cpp
+index/mimetype.h
+index/rclmon.h
+index/rclmon.sh
+index/rclmonprc.cpp
+index/rclmonrcv.cpp
+index/recollindex.cpp
+index/recollindex.h
+internfile/
+internfile/Filter.h
+internfile/Makefile
+internfile/htmlparse.cpp
+internfile/htmlparse.h
+internfile/indextext.h
+internfile/internfile.cpp
+internfile/internfile.h
+internfile/mh_exec.cpp
+internfile/mh_exec.h
+internfile/mh_execm.cpp
+internfile/mh_execm.h
+internfile/mh_html.cpp
+internfile/mh_html.h
+internfile/mh_mail.cpp
+internfile/mh_mail.h
+internfile/mh_mbox.cpp
+internfile/mh_mbox.h
+internfile/mh_text.cpp
+internfile/mh_text.h
+internfile/mh_unknown.h
+internfile/mimehandler.cpp
+internfile/mimehandler.h
+internfile/myhtmlparse.cpp
+internfile/myhtmlparse.h
+kde/
+kde/kioslave/
+kde/kioslave/recoll/
+kde/kioslave/recoll/00README.txt
+kde/kioslave/recoll/CMakeLists.txt
+kde/kioslave/recoll/Makefile.kde3
+kde/kioslave/recoll/cleancmakestuff.sh
+kde/kioslave/recoll/data/
+kde/kioslave/recoll/data/help.html
+kde/kioslave/recoll/data/searchable.html
+kde/kioslave/recoll/data/welcome.html
+kde/kioslave/recoll/dirif.cpp
+kde/kioslave/recoll/htmlif.cpp
+kde/kioslave/recoll/kio_recoll.cpp
+kde/kioslave/recoll/kio_recoll.h
+kde/kioslave/recoll/kio_recoll.la
+kde/kioslave/recoll/notes.txt
+kde/kioslave/recoll/recoll.protocol
+kde/kioslave/recoll/recollf.protocol
+kde/kioslave/recoll/recollnolist.protocol
+lib/
+lib/Makefile
+lib/mkMake
+makestaticdist.sh
+mk/
+mk/AIX
+mk/Darwin
+mk/FreeBSD
+mk/Linux
+mk/OpenBSD
+mk/SunOS
+mk/commondefs
+mk/localdefs.in
+php/
+php/00README.txt
+php/recoll/
+php/recoll/config.m4
+php/recoll/make.sh
+php/recoll/php_recoll.h
+php/recoll/recoll.cpp
+php/sample/
+php/sample/shell.php
+python/
+python/README.txt
+python/recoll/
+python/recoll/pyrecoll.cpp
+python/recoll/setup.py
+python/samples/
+python/samples/rcldlkp.py
+python/samples/rclmbox.py
+python/samples/recollq.py
+python/samples/recollqsd.py
+python/xesam/
+python/xesam/xesam-recoll-service
+qt4gui/
+qt4gui/q3richtext_p.h
+qt4gui/rclmain.ui
+qt4gui/recoll.pro.in
+qt4gui/recoll.qrc
+qt4gui/spell.ui
+qt4gui/ui_rclmain.h-4.5
+qt4gui/uifrom3
+qtgui/
+qtgui/advsearch.ui
+qtgui/advsearch.ui.h
+qtgui/advsearch_w.cpp
+qtgui/advsearch_w.h
+qtgui/confgui/
+qtgui/confgui/confgui.cpp
+qtgui/confgui/confgui.h
+qtgui/confgui/confguiindex.cpp
+qtgui/confgui/confguiindex.h
+qtgui/confgui/conflinkrcl.h
+qtgui/confgui/main.cpp
+qtgui/confgui/trconf.pro
+qtgui/guiutils.cpp
+qtgui/guiutils.h
+qtgui/i18n/
+qtgui/i18n/recoll_de.qm
+qtgui/i18n/recoll_de.ts
+qtgui/i18n/recoll_fr.qm
+qtgui/i18n/recoll_fr.ts
+qtgui/i18n/recoll_it.qm
+qtgui/i18n/recoll_it.ts
+qtgui/i18n/recoll_ru.qm
+qtgui/i18n/recoll_ru.ts
+qtgui/i18n/recoll_tr.qm
+qtgui/i18n/recoll_tr.ts
+qtgui/i18n/recoll_uk.qm
+qtgui/i18n/recoll_uk.ts
+qtgui/i18n/recoll_xx.qm
+qtgui/i18n/recoll_xx.ts
+qtgui/idxthread.cpp
+qtgui/idxthread.h
+qtgui/images/
+qtgui/images/asearch.png
+qtgui/images/cancel.png
+qtgui/images/close.png
+qtgui/images/d_firstpage.png
+qtgui/images/d_nextpage.png
+qtgui/images/d_prevpage.png
+qtgui/images/d_spell.png
+qtgui/images/firstpage.png
+qtgui/images/history.png
+qtgui/images/nextpage.png
+qtgui/images/prevpage.png
+qtgui/images/sortparms.png
+qtgui/images/spell.png
+qtgui/main.cpp
+qtgui/mtpics/
+qtgui/mtpics/License_sidux.txt
+qtgui/mtpics/README
+qtgui/mtpics/document.png
+qtgui/mtpics/drawing.png
+qtgui/mtpics/folder.png
+qtgui/mtpics/html.png
+qtgui/mtpics/image.png
+qtgui/mtpics/message.png
+qtgui/mtpics/mozilla_doc.png
+qtgui/mtpics/pdf.png
+qtgui/mtpics/pidgin.png
+qtgui/mtpics/postscript.png
+qtgui/mtpics/presentation.png
+qtgui/mtpics/sidux-book.png
+qtgui/mtpics/soffice.png
+qtgui/mtpics/source.png
+qtgui/mtpics/sownd.png
+qtgui/mtpics/spreadsheet.png
+qtgui/mtpics/text-x-python.png
+qtgui/mtpics/txt.png
+qtgui/mtpics/wordprocessing.png
+qtgui/preview.ui
+qtgui/preview.ui.h
+qtgui/preview_w.cpp
+qtgui/preview_w.h
+qtgui/rclhelp.cpp
+qtgui/rclhelp.h
+qtgui/rclmain.ui
+qtgui/rclmain_w.cpp
+qtgui/rclmain_w.h
+qtgui/recoll.h
+qtgui/recoll.pro.in
+qtgui/recollmain.ui.h
+qtgui/reslist.cpp
+qtgui/reslist.h
+qtgui/searchclause_w.cpp
+qtgui/searchclause_w.h
+qtgui/sort.ui
+qtgui/sort.ui.h
+qtgui/sort_w.cpp
+qtgui/sort_w.h
+qtgui/spell.ui
+qtgui/spell_w.cpp
+qtgui/spell_w.h
+qtgui/ssearch_w.cpp
+qtgui/ssearch_w.h
+qtgui/ssearchb.ui
+qtgui/ssearchb.ui.h
+qtgui/uiprefs.ui
+qtgui/uiprefs.ui.h
+qtgui/uiprefs_w.cpp
+qtgui/uiprefs_w.h
+qtgui/viewaction.ui
+qtgui/viewaction_w.cpp
+qtgui/viewaction_w.h
+query/
+query/Makefile
+query/docseq.cpp
+query/docseq.h
+query/docseqdb.cpp
+query/docseqdb.h
+query/docseqhist.cpp
+query/docseqhist.h
+query/dynconf.cpp
+query/dynconf.h
+query/filtseq.cpp
+query/filtseq.h
+query/plaintorich.cpp
+query/plaintorich.h
+query/recollq.cpp
+query/recollq.h
+query/reslistpager.cpp
+query/reslistpager.h
+query/sortseq.cpp
+query/sortseq.h
+query/wasastringtoquery.cpp
+query/wasastringtoquery.h
+query/wasatorcl.cpp
+query/wasatorcl.h
+query/xadump.cpp
+rcldb/
+rcldb/Makefile
+rcldb/rcldb.cpp
+rcldb/rcldb.h
+rcldb/rcldb_p.h
+rcldb/rcldoc.cpp
+rcldb/rcldoc.h
+rcldb/rclquery.cpp
+rcldb/rclquery.h
+rcldb/rclquery_p.h
+rcldb/searchdata.cpp
+rcldb/searchdata.h
+rcldb/stemdb.cpp
+rcldb/stemdb.h
+rcldb/stoplist.cpp
+rcldb/stoplist.h
+recollinstall.in
+sampleconf/
+sampleconf/fields
+sampleconf/mimeconf
+sampleconf/mimemap
+sampleconf/mimeview
+sampleconf/recoll.conf.in
+unac/
+unac/AUTHORS
+unac/COPYING
+unac/README
+unac/README.recoll
+unac/unac.c
+unac/unac.h
+unac/unac_version.h
+utils/
+utils/Makefile
+utils/base64.cpp
+utils/base64.h
+utils/cancelcheck.h
+utils/circache.cpp
+utils/circache.h
+utils/closefrom.cpp
+utils/closefrom.h
+utils/conftree.cpp
+utils/conftree.h
+utils/copyfile.cpp
+utils/copyfile.h
+utils/debuglog.cpp
+utils/debuglog.h
+utils/execmd.cpp
+utils/execmd.h
+utils/fileudi.cpp
+utils/fileudi.h
+utils/fstreewalk.cpp
+utils/fstreewalk.h
+utils/idfile.cpp
+utils/idfile.h
+utils/md5.cpp
+utils/md5.h
+utils/mimeparse.cpp
+utils/mimeparse.h
+utils/netcon.cpp
+utils/netcon.h
+utils/pathut.cpp
+utils/pathut.h
+utils/pxattr.cpp
+utils/pxattr.h
+utils/readfile.cpp
+utils/readfile.h
+utils/refcntr.h
+utils/smallut.cpp
+utils/smallut.h
+utils/transcode.cpp
+utils/transcode.h
+utils/utf8iter.cpp
+utils/utf8iter.h
+utils/utf8testin.txt
+utils/wipedir.cpp
+utils/wipedir.h
+utils/x11mon.cpp
+utils/x11mon.h