diff --git a/Makefile b/Makefile
index 7edfba0c7..ee0f1083a 100644
--- a/Makefile
+++ b/Makefile
@@ -1114,7 +1114,7 @@ manifest:   configure
 	@for i in ${SRCCOMMONDIR} ${SRCHANDLERDIR} ${SRCPORTALDIR} ${SRCMANAGERDIR}; do \
 		cd $$i; \
 		rm -vf MANIFEST MANIFEST*bak; \
-		make manifest; \
+		$(MAKE) manifest; \
 		cd -; \
 	done
 	perl -i -ne 'print unless/proverc/' */MANIFEST
diff --git a/debian/control b/debian/control
index 0c5aa28df..50dc32d06 100644
--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,8 @@ Build-Depends-Indep: gsfonts <!nocheck>,
                      libauth-yubikey-webclient-perl <!nocheck>,
                      libauthen-oath-perl <!nocheck>,
                      libauthen-radius-perl <!nocheck>,
+                     libauthen-webauthn-perl <!nocheck>,
+                     libauthen-u2f-tester-perl <!nocheck>,
                      libcache-cache-perl <!nocheck>,
                      libclone-perl <!nocheck>,
                      libconfig-inifiles-perl <!nocheck>,
@@ -19,6 +21,8 @@ Build-Depends-Indep: gsfonts <!nocheck>,
                      libcrypt-openssl-x509-perl <!nocheck>,
                      libcrypt-urandom-perl <!nocheck>,
                      libcrypt-rijndael-perl <!nocheck>,
+                     libcrypt-u2f-server-perl <!nocheck>,
+                     libdatetime-format-rfc3339-perl <!nocheck>,
                      libdbd-sqlite3-perl <!nocheck>,
                      libdbi-perl <!nocheck>,
                      libdigest-hmac-perl <!nocheck>,
@@ -30,6 +34,7 @@ Build-Depends-Indep: gsfonts <!nocheck>,
                      libimage-magick-perl <!nocheck>,
                      libio-string-perl <!nocheck>,
                      libipc-run-perl <!nocheck>,
+                     liblist-moreutils-perl <!nocheck>,
                      libjson-perl <!nocheck>,
                      libjson-xs-perl <!nocheck>,
                      liblasso-perl <!nocheck>,
@@ -46,12 +51,13 @@ Build-Depends-Indep: gsfonts <!nocheck>,
                      libsoap-lite-perl <!nocheck>,
                      libstring-random-perl <!nocheck>,
                      libtest-mockobject-perl <!nocheck>,
-                     libtest-pod-perl <!nocheck>,
                      libtest-output-perl <!nocheck>,
+                     libtest-pod-perl <!nocheck>,
                      libtext-unidecode-perl <!nocheck>,
                      libtime-fake-perl <!nocheck>,
                      libunicode-string-perl <!nocheck>,
                      liburi-perl <!nocheck>,
+                     libhttp-message-perl <!nocheck>,
                      libwww-perl <!nocheck>,
                      libxml-libxml-perl <!nocheck>,
                      libxml-libxslt-perl <!nocheck>,
@@ -110,7 +116,6 @@ Description: Lemonldap::NG Web-SSO system documentation
 Package: lemonldap-ng-fastcgi-server
 Architecture: all
 Section: web
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          ${perl:Depends},
          lsb-base,
@@ -120,6 +125,7 @@ Depends: ${misc:Depends},
          libplack-perl
 Recommends: libhttp-parser-xs-perl,
             nginx-extras | nginx
+Pre-Depends: ${misc:Pre-Depends}
 Description: Lemonldap::NG FastCGI server
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application webservers. It can be used in conjunction with
@@ -138,7 +144,6 @@ Package: lemonldap-ng-uwsgi-app
 Architecture: all
 Section: web
 Depends: ${misc:Depends},
-         ${perl:Depends},
          liblemonldap-ng-handler-perl (= ${binary:Version})
 Recommends: libhttp-parser-xs-perl,
             uwsgi-plugin-psgi
@@ -230,7 +235,6 @@ Suggests: libconvert-base32-perl,
           libsoap-lite-perl,
           libxml-libxml-perl,
           libxml-simple-perl
-Conflicts: liblemonldap-ng-cli-perl
 Description: Lemonldap::NG common files
  Lemonldap::NG is a complete Web-SSO system that can run with reverse-proxies
  or directly on application webservers. It can be used in conjunction with
@@ -287,6 +291,7 @@ Depends: ${misc:Depends},
          liblist-moreutils-perl,
          libemail-date-format-perl
 Recommends: gsfonts,
+            libauthen-webauthn-perl,
             libcrypt-openssl-bignum-perl,
             libconvert-base32-perl,
             libio-string-perl,
@@ -297,19 +302,19 @@ Recommends: gsfonts,
             libio-socket-timeout-perl,
             libunicode-string-perl
 Suggests: gpg,
+          libauthen-radius-perl,
           libcrypt-u2f-server-perl,
           libdbi-perl,
           libglib-perl,
           libgssapi-perl,
           libimage-magick-perl,
           liblasso-perl,
-          libnet-facebook-oauth2-perl (>= 0.10),
+          libnet-facebook-oauth2-perl,
           libnet-openid-consumer-perl,
           libnet-openid-server-perl,
           libnet-oauth-perl,
           libsoap-lite-perl,
           libweb-id-perl,
-          libauthen-radius-perl,
           slapd
 Pre-Depends: debconf
 Description: Lemonldap::NG authentication portal part