diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9fc9a99490835cdedcc87471ad9b54299941c0b..2283ccc3332d527ca789dc5d76a07a46679b80b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -72,6 +72,8 @@ doc-dist.Fedora:
   - make -C doc gnutls.html
   - PATH="$PATH:/usr/share/sgml/docbook/xsl-stylesheets-1.79.1/epub/bin/" make -C doc gnutls.epub &&
     make -C doc/latex gnutls.pdf
+# check whether distribution with or without included libopts is ok
+  - make distcheck DISTCHECK_CONFIGURE_FLAGS="--enable-local-libopts --disable-tests"
   - make distcheck
   tags:
   - shared
diff --git a/src/libopts/Makefile.am b/src/libopts/Makefile.am
index 54ba89e0bb79f35ee842a473d8a31fb2d2dc6c6f..1c46ca3d98cfc6fe07e6cf37b0265cd649032a89 100644
--- a/src/libopts/Makefile.am
+++ b/src/libopts/Makefile.am
@@ -54,4 +54,4 @@ EXTRA_DIST += \
     restore.c               save.c                  sort.c  \
     stack.c                 stdnoreturn.in.h        streqvcmp.c  \
     text_mmap.c             time.c                  tokenize.c  \
-    usage.c                 version.c
+    usage.c version.c save-flags.c save-flags.h