diff --git a/.hgignore b/.hgignore
index 062d9979..86e851d3 100644
--- a/.hgignore
+++ b/.hgignore
@@ -86,9 +86,8 @@ src/query/location.hh
 src/query/position.hh
 src/query/recollq
 src/query/stack.hh
-src/query/wasaparse.output
-src/query/wasaparse.tab.cpp
-src/query/wasaparse.tab.h
+src/query/wasaparse.cpp
+src/query/wasaparse.hpp
 src/query/xadump
 src/recollinstall
 src/sampleconf/rclmon.sh
diff --git a/src/Makefile.am b/src/Makefile.am
index f0c0c231..9623d4ea 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -237,7 +237,9 @@ utils/x11mon.cpp \
 utils/x11mon.h
 
 BUILT_SOURCES = query/wasaparse.cpp query/wasaparse.hpp
-CLEANFILES = $(BUILT_SOURCES)
+AM_YFLAGS = -d
+CLEANFILES = query/wasaparse.cpp query/wasaparse.hpp \
+           query/location.hh  query/position.hh  query/stack.hh
 
 # We use -release: the lib is only shared
 # between recoll programs from the same release.
@@ -285,6 +287,8 @@ recollq_LDADD = librecoll.la
 xadump_SOURCES = query/xadump.cpp
 xadump_LDADD = librecoll.la $(LIBXAPIAN) $(LIBICONV)
 
+# Note: I'd prefer the generated query parser files not to be distributed
+# at all, but failed to achieve this
 EXTRA_DIST = \
 bincimapmime/00README.recoll bincimapmime/AUTHORS bincimapmime/COPYING \
 \
@@ -303,6 +307,9 @@ filters \
 \
 index/rclmon.sh \
 \
+query/wasaparse.cpp query/wasaparse.hpp query/y.tab.h \
+query/location.hh  query/position.hh  query/stack.hh \
+\
 qtgui/advsearch.ui \
 qtgui/advsearch_w.cpp \
 qtgui/advsearch_w.h \
diff --git a/src/VERSION b/src/VERSION
index 3500250a..57807d6d 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-1.21.0
+1.22.0