diff --git a/CMakeLists.txt b/CMakeLists.txt
index f8b8330f25..f1d07eea26 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,7 +183,7 @@ if(BUILD_CLIENT)
     endif()
     find_package(Sphinx)
     find_package(PdfLatex)
-    find_package(OpenSSL REQUIRED VERSION 1.1)
+    find_package(OpenSSL 1.1 REQUIRED )
 
    find_package(ZLIB REQUIRED)
    find_package(GLib2)
diff --git a/admin/linux/debian/debian.cosmic/control b/admin/linux/debian/debian.cosmic/control
deleted file mode 100644
index 6ccd6421b4..0000000000
--- a/admin/linux/debian/debian.cosmic/control
+++ /dev/null
@@ -1,88 +0,0 @@
-Source: nextcloud-client
-Section: contrib/devel
-Priority: optional
-Maintainer: István Váradi <ivaradi@varadiistvan.hu>
-Build-Depends: cmake,
-               debhelper,
-               cdbs,
-               dh-python,
-               extra-cmake-modules (>= 5.16),
-               kdelibs5-dev,
-               kio-dev,
-               libcmocka-dev,
-               libhttp-dav-perl,
-               libinotify-dev [kfreebsd-any],
-               libqt5webkit5-dev,
-               libsqlite3-dev,
-               libssl-dev (>> 1.0.0),
-               zlib1g-dev,
-               optipng,
-               pkg-kde-tools,
-               python-sphinx | python3-sphinx,
-               python3-all,
-               qt5keychain-dev,
-               qtwebengine5-dev,
-               qtdeclarative5-dev,
-               qttools5-dev,
-               qttools5-dev-tools,
-               xvfb
-Standards-Version: 3.9.8
-Homepage: https://github.com/nextcloud/client_theming
-#Vcs-Git: git://anonscm.debian.org/collab-maint/nextcloud-client.git
-#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/nextcloud-client.git
-
-Package: nextcloud-client
-Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
-Description: Nextcloud desktop sync client
- Use the desktop client to keep your files synchronized
- between your Nextcloud server and your desktop. Select
- one or more directories on your local machine and always
- have access to your latest files wherever you are.
-
-Package: libnextcloudsync0
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Nextcloud sync library
- Used by the Nextcloud desktop client as the synchronization engine.
-
-Package: libnextcloudsync-dev
-Architecture: any
-Section: contrib/libdevel
-Depends: libnextcloudsync0 (=${binary:Version}), ${misc:Depends}
-Description: Nextcloud sync library development files
- The headers and development library for the Nextcloud sync library.
-
-Package: nextcloud-client-l10n
-Architecture: all
-Depends: ${misc:Depends}
-Description: Nextcloud client internatialization files
- The translation files.
-
-Package: nextcloud-client-nautilus
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nautilus, nautilus, ${misc:Depends}
-Description: Nautilus plugin for Nextcloud
- This package contains a Nautilus plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-nemo
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-nemo | nemo-python, nemo, ${misc:Depends}
-Description: Nemo plugin for Nextcloud
- This package contains a Nemo plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-caja
-Architecture: all
-Depends: nextcloud-client (>=${binary:Version}), libnextcloudsync0, python-caja, caja, ${misc:Depends}
-Description: Caja plugin for Nextcloud
- This package contains a Caja plugin to display
- synchronization status icons for Nextcloud files.
-
-Package: nextcloud-client-dolphin
-Architecture: any
-Depends: dolphin (>= 4:15.12.1), libnextcloudsync0 (= ${binary:Version}), nextcloud-client, ${misc:Depends}, ${shlibs:Depends}
-Description: Dolphin plugin for Nextcloud
- This package contains a Dolphin plugin to display
- synchronization status icons for Nextcloud files.
diff --git a/admin/linux/debian/debian.stable/control b/admin/linux/debian/debian.stable/control
index b1253ad933..213439526c 100644
--- a/admin/linux/debian/debian.stable/control
+++ b/admin/linux/debian/debian.stable/control
@@ -13,6 +13,7 @@ Build-Depends: cmake,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
                libqt5webkit5-dev,
+               libqt5svg5-dev,
                libsqlite3-dev,
                libssl-dev (>> 1.0.0),
                zlib1g-dev,
diff --git a/admin/linux/debian/debian.bionic/control b/admin/linux/debian/debian.xenial/control
similarity index 96%
rename from admin/linux/debian/debian.bionic/control
rename to admin/linux/debian/debian.xenial/control
index 6ccd6421b4..cb595b7678 100644
--- a/admin/linux/debian/debian.bionic/control
+++ b/admin/linux/debian/debian.xenial/control
@@ -13,6 +13,7 @@ Build-Depends: cmake,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
                libqt5webkit5-dev,
+               libqt5svg5-dev,
                libsqlite3-dev,
                libssl-dev (>> 1.0.0),
                zlib1g-dev,
@@ -33,7 +34,8 @@ Homepage: https://github.com/nextcloud/client_theming
 
 Package: nextcloud-client
 Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
+Recommends: libgnome-keyring0
 Description: Nextcloud desktop sync client
  Use the desktop client to keep your files synchronized
  between your Nextcloud server and your desktop. Select
diff --git a/admin/linux/debian/debian/control b/admin/linux/debian/debian/control
index 38effd77db..fc1fbbe431 100644
--- a/admin/linux/debian/debian/control
+++ b/admin/linux/debian/debian/control
@@ -8,10 +8,11 @@ Build-Depends: cmake,
                dh-python,
                extra-cmake-modules (>= 5.16),
                kdelibs5-dev,
-               kio-dev,
+               libkf5kio-dev,
                libcmocka-dev,
                libhttp-dav-perl,
                libinotify-dev [kfreebsd-any],
+               libqt5svg5-dev,
                libqt5webkit5-dev,
                libsqlite3-dev,
                libssl-dev (>> 1.0.0),
@@ -33,8 +34,7 @@ Homepage: https://github.com/nextcloud/client_theming
 
 Package: nextcloud-client
 Architecture: any
-Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, nextcloud-client-l10n
-Recommends: libgnome-keyring0
+Depends: libnextcloudsync0 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libgnome-keyring0, nextcloud-client-l10n
 Description: Nextcloud desktop sync client
  Use the desktop client to keep your files synchronized
  between your Nextcloud server and your desktop. Select