diff --git a/debian/aegir-archive-keyring.install b/debian/aegir-archive-keyring.install
new file mode 100644
index 0000000..cd97abc
--- /dev/null
+++ b/debian/aegir-archive-keyring.install
@@ -0,0 +1 @@
+debian/aegir-archive-keyring.gpg usr/share/keyrings
diff --git a/debian/aegir3-hostmaster.config b/debian/aegir3-hostmaster.config
index c3a972d..76cc0b7 100644
--- a/debian/aegir3-hostmaster.config
+++ b/debian/aegir3-hostmaster.config
@@ -40,8 +40,8 @@ db_input low aegir/db_host || true
 db_input low aegir/db_user || true
 # if we got here, it means aegir is not installed and we forgot the
 # root password, ask for it again
-db_fset aegir/db_password "seen" "false" || true
-db_input high aegir/db_password || true
+#db_fset aegir/db_password "seen" "false" || true
+#db_input high aegir/db_password || true
 
 # (taken from the webapps-common httpd functions)
 # wc_httpd_installed: test for installed httpds
diff --git a/debian/aegir3-hostmaster.postinst b/debian/aegir3-hostmaster.postinst
index ed831de..df2d554 100644
--- a/debian/aegir3-hostmaster.postinst
+++ b/debian/aegir3-hostmaster.postinst
@@ -111,22 +111,36 @@ case "$1" in
             fi
             db_get "aegir/db_host"
             AEGIR_DB_HOST="$RET"
-            db_get "aegir/db_user"
-            AEGIR_DB_USER="$RET"
-            db_get "aegir/db_password"
-            AEGIR_DB_PASS="$RET"
-            if [ -z "$AEGIR_DB_PASS" ]; then
-              echo EMPTY database password, can not be good.
-            fi
+
+            # if !(mariadb >= 10.1 ???)
+#            db_get "aegir/db_user"
+#            AEGIR_DB_USER="$RET"
+#            db_get "aegir/db_password"
+#            AEGIR_DB_PASS="$RET"
+#            if [ -z "$AEGIR_DB_PASS" ]; then
+#              echo EMPTY database password, can not be good.
+#            fi
+            # fi
+
             db_get "aegir/email"
             EMAIL="$RET"
 
             db_go
 
+            # if !(mariadb >= 10.1 ???)
             # forget the DB password in debconf storage
-            db_reset aegir/db_password || true
-            db_fset aegir/db_password "seen" "true" || true
+            #db_reset aegir/db_password || true
+            #db_fset aegir/db_password "seen" "true" || true
+            # fi
             db_stop
+            # if mariadb >= 10.1 ???
+              AEGIR_DB_USER="aegir_root"
+
+              # Random password, will be stored in /var/aegir/.drush/server_localhost.alias.drushrc.php
+              AEGIR_DB_PASS=$(openssl rand -base64 12)
+
+              /usr/bin/mysql -e "GRANT ALL ON *.* TO '$AEGIR_DB_USER'@'localhost' IDENTIFIED BY '$AEGIR_DB_PASS' WITH GRANT OPTION"
+            # fi
             
             if [ -d $AEGIRHOME/.drush/provision ]; then
                 echo "existing provision in $AEGIRHOME/.drush/provision detected, move away and try again"
diff --git a/debian/control b/debian/control
index 499cab5..90b89c9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: aegir3-provision
 Section: admin
 Priority: optional
-Maintainer: Antoine Beaupré <anarcat@debian.org>
+Maintainer: Herman van Rink <helmo@initfour.nl>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8)
 Standards-Version: 3.9.2
@@ -56,6 +56,7 @@ Architecture: all
 Depends: ${misc:Depends}, aegir3-provision (>= ${source:Version}), aegir3-hostmaster (>= ${source:Version})
 Conflicts: aegir, aegir2
 Replaces: aegir, aegir2
+Suggests: aegir-archive-keyring
 Description: mass Drupal hosting system
  A set of contributed modules for Drupal that aims to solve the
  problem of managing a large number of Drupal sites. It does this by
@@ -87,3 +88,10 @@ Description: web frontend for the Aegir hosting system
     connect via SSH to sync files and reload apache
   * /etc/sudoers.d/aegir - allow aegir to restart apache
   * /etc/apache2/conf.d/aegir.conf - load the aegir apache config
+
+Package: aegir-archive-keyring
+Architecture: all
+Depends: ${misc:Depends}, gnupg2 | gnupg
+Description: GnuPG archive keys for the Aegir hosting system
+ The Aegir project digitally signs its Release files. This package
+ contains the archive keys used for that.
diff --git a/debian/rules b/debian/rules
index 6eb75ec..fe20e7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,9 @@
 %:
 	dh $@
 
-override_dh_install:
+override_dh_auto_install:
+	dh_auto_install
+
 	cp -r "$(CURDIR)/db/" "$(CURDIR)/http/" "$(CURDIR)/"*.make "$(CURDIR)/platform/" "$(CURDIR)/Provision/" "$(CURDIR)/Symfony/" "$(CURDIR)"/*.inc "$(CURDIR)"/*.php "$(CURDIR)"/*.info "$(CURDIR)/debian/aegir3-provision/usr/share/drush/commands/provision/"
 
 	# We need this nasty hack, because we added directories.