diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5484d5538..662dde829 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,7 +42,22 @@ build:debian-oldstable:
   image: debian:oldstable
   before_script:
     - >
-       apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev libfbclient2 libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.4 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libldap2-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libsage-dev libxml2-dev libxslt1-dev libbonobo2-dev libcos4-dev libomniorb4-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libaa1-dev libxtst-dev libffi-dev kdelibs5-dev firebird-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgsl0-dev libncurses5-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev llvm-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev
+       apt-get update && apt-get install -y build-essential g++ automake 
+       autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev 
+       postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev 
+       libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev 
+       libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev 
+       libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev 
+       libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev 
+       libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev 
+       libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev 
+       libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev 
+       libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev 
+       libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev 
+       libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev 
+       libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev 
+       libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git 
+       libssl-dev
   script:
     - ./reconf-all
     - GAMBAS_CONFIG_FAILURE=1 ./configure -C
@@ -53,10 +68,24 @@ build:debian-stable:
   image: debian:stable
   before_script:
     - >
-       apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-9.6 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libesd0-dev libdirectfb-dev libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgnome-keyring-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev
+       apt-get update && apt-get install -y build-essential g++ automake 
+       autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev 
+       postgresql-server-dev-11 libsqlite0-dev libsqlite3-dev libglib2.0-dev 
+       libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev 
+       libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev 
+       libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev 
+       libpoppler-private-dev libasound2-dev libdirectfb-dev libxtst-dev 
+       libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev 
+       libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev 
+       linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev 
+       libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev 
+       libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev 
+       libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev 
+       libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git 
+       libssl-dev
   script:
     - ./reconf-all
-    - GAMBAS_CONFIG_FAILURE=1 ./configure -C
+    - GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-keyring
     - make -j$(nproc)
     - make install
 
@@ -64,7 +93,21 @@ build:debian-testing:
   image: debian:testing
   before_script:
     - >
-       apt-get update && apt-get install -y build-essential g++ automake autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev postgresql-server-dev-11 libsqlite0-dev libsqlite3-dev libglib2.0-dev libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev libpoppler-private-dev libasound2-dev libdirectfb-dev libxtst-dev libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git libssl-dev
+       apt-get update && apt-get install -y build-essential g++ automake 
+       autoconf libbz2-dev default-libmysqlclient-dev unixodbc-dev libpq-dev 
+       postgresql-server-dev-11 libsqlite0-dev libsqlite3-dev libglib2.0-dev 
+       libgtk2.0-dev libcurl4-gnutls-dev libgtkglext1-dev libpcre3-dev 
+       libsdl-sound1.2-dev libsdl-mixer1.2-dev libsdl-image1.2-dev libxml2-dev 
+       libxslt1-dev librsvg2-dev libpoppler-dev libpoppler-glib-dev 
+       libpoppler-private-dev libasound2-dev libdirectfb-dev libxtst-dev 
+       libffi-dev libqt4-dev libqtwebkit-dev libqt4-opengl-dev libglew-dev 
+       libimlib2-dev libv4l-dev libsdl-ttf2.0-dev libgdk-pixbuf2.0-dev 
+       linux-libc-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev 
+       libcairo2-dev libgsl-dev libncurses5-dev libgmime-2.6-dev libalure-dev 
+       libgmp-dev libgtk-3-dev libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev 
+       libsdl2-image-dev sane-utils libdumb1-dev libqt5opengl5-dev 
+       libqt5svg5-dev libqt5webkit5-dev libqt5x11extras5-dev qtbase5-dev git 
+       libssl-dev
   script:
     - ./reconf-all
     - GAMBAS_CONFIG_FAILURE=1 ./configure -C --disable-keyring