diff --git a/.hgignore b/.hgignore
index 69445a83..db7baf64 100644
--- a/.hgignore
+++ b/.hgignore
@@ -86,7 +86,7 @@ src/query/position.hh
 src/query/recollq
 src/query/stack.hh
 src/query/wasaparse.cpp
-src/query/wasaparse.h
+src/query/wasaparse.hpp
 src/sampleconf/rclmon.sh
 src/sampleconf/recoll.conf
 src/utils/alldeps
diff --git a/src/Makefile.am b/src/Makefile.am
index 5377224b..bab1d026 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -73,7 +73,6 @@ common/textsplit.cpp \
 common/textsplit.h \
 common/unacpp.cpp \
 common/unacpp.h \
-common/unordered_defs.h \
 common/uproplist.h \
 index/beaglequeue.cpp \
 index/beaglequeue.h \
@@ -318,7 +317,6 @@ kde/kioslave/kio_recoll/recollf.protocol \
 kde/kioslave/kio_recoll/recollnolist.protocol \
 kde/kioslave/kio_recoll/recoll.protocol \
 \
-query/wasaparse.cpp query/wasaparse.hpp query/y.tab.h \
 query/location.hh  query/position.hh  query/stack.hh \
 \
 qtgui/advsearch.ui \
@@ -561,3 +559,8 @@ doc/user/usermanual.html:
 
 dist_man1_MANS = doc/man/recoll.1 doc/man/recollq.1 doc/man/recollindex.1
 dist_man5_MANS = doc/man/recoll.conf.5
+
+dist-hook:
+	if test ! -z "`hg status`";then echo Local directory is modified ; \
+  	  exit 1; fi
+	hg tag -f -m "Release $(VERSION) tagged" RECOLL-$(VERSION)
diff --git a/src/query/wasaparse.ypp b/src/query/wasaparse.ypp
index 9d88d9c1..50f38422 100644
--- a/src/query/wasaparse.ypp
+++ b/src/query/wasaparse.ypp
@@ -1,5 +1,6 @@
 %{
 #define YYDEBUG 1
+#include "autoconfig.h"
 
 #include <stdio.h>
 
@@ -8,7 +9,7 @@
 
 #include "searchdata.h"
 #include "wasaparserdriver.h"
-#include "wasaparse.h"
+#include "wasaparse.hpp"
 
 using namespace std;
 
@@ -27,7 +28,7 @@ static void qualify(Rcl::SearchDataClauseDist *, const string &);
 static void addSubQuery(WasaParserDriver *d,
                         Rcl::SearchData *sd, Rcl::SearchData *sq)
 {
-    sd->addClause(new Rcl::SearchDataClauseSub(RefCntr<Rcl::SearchData>(sq)));
+    sd->addClause(new Rcl::SearchDataClauseSub(STD_SHARED_PTR<Rcl::SearchData>(sq)));
 }
 
 %}
diff --git a/src/query/wasaparseaux.cpp b/src/query/wasaparseaux.cpp
index 5008d81b..ce63e9d6 100644
--- a/src/query/wasaparseaux.cpp
+++ b/src/query/wasaparseaux.cpp
@@ -26,7 +26,7 @@
 #define YYDEBUG 1
 
 // bison-generated file
-#include "wasaparse.h"
+#include "wasaparse.hpp"
 
 using namespace std;
 using namespace Rcl;
diff --git a/src/ylwrap b/src/ylwrap
index 8893b8b5..ee0c0f9f 100755
--- a/src/ylwrap
+++ b/src/ylwrap
@@ -42,13 +42,16 @@ for f in location.hh position.hh stack.hh; do
     cmp -s "${tmpdir}"/$f "${inputdir}"/$f || cp -p "${tmpdir}"/$f "${inputdir}"
 done
 
+# Note that we'd prefer to use wasaparse.h instead of wasaparse.hpp,
+# but automake generates a dist list with wasaparse.hpp, so no choice.
+
 # Fix the include line in y.tab.c (it wants to include y.tab.h, but we already
-# include it as wasaparse.h
+# include it as wasaparse.hpp
 (cd "${tmpdir}"; \
     sed -e 's/#include "y.tab.h"//' < y.tab.c > toto; \
     mv -f toto y.tab.c)
 
 cmp -s "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp || \
         cp -p "${tmpdir}"/y.tab.c "${inputdir}"/wasaparse.cpp
-cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h || \
-        cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.h
+cmp -s "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp || \
+        cp -p "${tmpdir}"/y.tab.h "${inputdir}"/wasaparse.hpp