diff --git a/README.rst b/README.rst
index 6fddac5..0a345f1 100644
--- a/README.rst
+++ b/README.rst
@@ -9,7 +9,7 @@ An installer which deploy a complete mail server based on Modoboa.
 
    This tool is still in beta stage, it has been tested on:
 
-   * Debian Jessie (8) and Stretch (9)
+   * Debian Jessie (8) / Stretch (9) / Buster (10)
    * Ubuntu Trusty (14.04) and upper
    * CentOS 7
 
diff --git a/modoboa_installer/scripts/amavis.py b/modoboa_installer/scripts/amavis.py
index 8d3abf8..d4a8c43 100644
--- a/modoboa_installer/scripts/amavis.py
+++ b/modoboa_installer/scripts/amavis.py
@@ -19,7 +19,7 @@ class Amavis(base.Installer):
         "deb": [
             "libdbi-perl", "amavisd-new", "arc", "arj", "cabextract",
             "liblz4-tool", "lrzip", "lzop", "p7zip-full", "rpm2cpio",
-            "unrar-free", "ripole"
+            "unrar-free",
         ],
         "rpm": [
             "amavisd-new", "arj", "cabextract", "lz4", "lrzip",
@@ -53,9 +53,6 @@ class Amavis(base.Installer):
         """Additional packages."""
         packages = super(Amavis, self).get_packages()
         if package.backend.FORMAT == "deb":
-            if platform.linux_distribution()[2] != "bionic":
-                # Quick fix
-                packages.append("zoo")
             db_driver = "pg" if self.db_driver == "pgsql" else self.db_driver
             return packages + ["libdbd-{}-perl".format(db_driver)]
         if self.db_driver == "pgsql":
diff --git a/modoboa_installer/scripts/modoboa.py b/modoboa_installer/scripts/modoboa.py
index 9632d99..2c3a4df 100644
--- a/modoboa_installer/scripts/modoboa.py
+++ b/modoboa_installer/scripts/modoboa.py
@@ -23,7 +23,9 @@ class Modoboa(base.Installer):
     packages = {
         "deb": [
             "build-essential", "python-dev", "libxml2-dev", "libxslt-dev",
-            "libjpeg-dev", "librrd-dev", "rrdtool", "libffi-dev", "cron"],
+            "libjpeg-dev", "librrd-dev", "rrdtool", "libffi-dev", "cron",
+            "libssl-dev"
+        ],
         "rpm": [
             "gcc", "gcc-c++", "python-devel", "libxml2-devel", "libxslt-devel",
             "libjpeg-turbo-devel", "rrdtool-devel", "rrdtool", "libffi-devel",