diff --git a/deployer/requirements/task/check_database.php b/deployer/requirements/task/check_database.php
index a02a410..1b81d1f 100644
--- a/deployer/requirements/task/check_database.php
+++ b/deployer/requirements/task/check_database.php
@@ -35,7 +35,9 @@
         return;
     }
 
-    if (preg_match('/Distrib\s+([\d.]+)/', $versionOutput, $matches)) {
+    if (preg_match('/Distrib\s+([\d.]+)/', $versionOutput, $matches)
+        || preg_match('/([\d.]+)-MariaDB/', $versionOutput, $matches)
+    ) {
         $actualVersion = $matches[1];
         $minVersion = get('requirements_mariadb_min_version');
         $meets = version_compare($actualVersion, $minVersion, '>=');
diff --git a/deployer/requirements/task/check_packages.php b/deployer/requirements/task/check_packages.php
index 5ce5d77..0a1c2d0 100644
--- a/deployer/requirements/task/check_packages.php
+++ b/deployer/requirements/task/check_packages.php
@@ -17,7 +17,7 @@
         }
 
         try {
-            $found = test("which $command 2>/dev/null");
+            $found = test("command -v $command >/dev/null 2>&1");
         } catch (RunException) {
             addRequirementRow("Package: $displayName", REQUIREMENT_SKIP, 'Check failed');