diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
new file mode 100644
index 0000000000..fd36909ab6
--- /dev/null
+++ b/.github/workflows/c-cpp.yml
@@ -0,0 +1,28 @@
+name: C/C++ CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: setup
+      run:  |
+        sudo apt install ima-evm-utils libzstd-dev doxygen gettext autoconf automake autopoint libgcrypt-dev libpopt-dev libarchive-dev liblua5.3-dev &&
+        sudo ln -T /usr/lib/x86_64-linux-gnu/pkgconfig/lua53.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc &&
+        /usr/bin/pkg-config 'lua >= 5.2'
+    - name: configure
+      run: sh -x autogen.sh --rpmconfigure
+    - name: make
+      run: make 
+    - name: make check
+      run: make check && ! ./rpm 2>/tmp/rpm.txt && grep -F '[-q' /tmp/rpm.txt
+    - name: make distcheck
+      run: make distcheck
diff --git a/build/Makefile.am b/build/Makefile.am
index f613f1beb8..cd32afef7f 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -3,6 +3,7 @@
 include $(top_srcdir)/rpm.am
 AM_CFLAGS = @RPMCFLAGS@
 AM_CFLAGS += @OPENMP_CFLAGS@
+AM_CFLAGS += @LUA_CFLAGS@
 
 AM_CPPFLAGS =  -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
 AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
diff --git a/lib/poptQV.c b/lib/poptQV.c
index d9d1fad759..fb295de8b8 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -91,8 +91,6 @@ struct poptOption rpmQVSourcePoptTable[] = {
  { "hdrid", '\0', 0, 0, POPT_QUERYBYHDRID,
 	N_("query/verify package(s) with header identifier"), "SHA1" },
 
- { "query", 'q', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'q',
-	N_("rpm query mode"), NULL },
  { "querybynumber", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYNUMBER,
 	N_("query/verify a header instance"), "HDRNUM" },
  { "tid", '\0', POPT_ARGFLAG_DOC_HIDDEN, 0, POPT_QUERYBYTID,
@@ -219,6 +217,8 @@ struct poptOption rpmQVFilePoptTable[] = {
 struct poptOption rpmQueryPoptTable[] = {
  { NULL, '\0', POPT_ARG_CALLBACK | POPT_CBFLAG_INC_DATA | POPT_CBFLAG_CONTINUE,
 	queryArgCallback, 0, NULL, NULL },
+ { "query", 'q', 0, 0, 'q',
+	N_("query information about packages, in particular:"), NULL },
  { "dump", '\0', 0, 0, POPT_DUMP,
 	N_("dump basic file information"), NULL },
  { NULL, 'i', POPT_ARGFLAG_DOC_HIDDEN, 0, 'i',