diff --git a/pom.xml b/pom.xml
index 2a0c2d7c85..37524bbc43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@
         <dependency.activiti.version>5.23.0</dependency.activiti.version>
         <dependency.postgresql.version>42.2.10</dependency.postgresql.version>
         <dependency.mysql.version>5.1.48</dependency.mysql.version>
-        <dependency.mariadb.version>2.2.5</dependency.mariadb.version>
+        <dependency.mariadb.version>2.6.0</dependency.mariadb.version>
         <dependency.antlr.version>3.5.2</dependency.antlr.version>
         <!-- REPO-4964 -->
         <dependency.keycloak.version>7.0.0</dependency.keycloak.version>
diff --git a/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java b/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
index 2bb0828b30..8dc13064c7 100644
--- a/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
+++ b/src/main/java/org/alfresco/repo/domain/dialect/DialectFactory.java
@@ -124,7 +124,7 @@ public class DialectFactory
     static {
         // detectors...
         MAPPERS.put( "PostgreSQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.PostgreSQLDialect" ) );
-
+        MAPPERS.put( "MariaDB", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.MySQLInnoDBDialect" ) );
         MAPPERS.put( "MySQL", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.MySQLInnoDBDialect" ) );
         MAPPERS.put( "Microsoft SQL Server Database", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) );
         MAPPERS.put( "Microsoft SQL Server", new VersionInsensitiveMapper( "org.alfresco.repo.domain.dialect.SQLServerDialect" ) );
diff --git a/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java b/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
index 2b0a30ee6e..cb954d9aa0 100644
--- a/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
+++ b/src/main/java/org/alfresco/repo/workflow/activiti/AlfrescoProcessEngineConfiguration.java
@@ -1,28 +1,28 @@
-/*
- * #%L
- * Alfresco Repository
- * %%
- * Copyright (C) 2005 - 2016 Alfresco Software Limited
- * %%
- * This file is part of the Alfresco software. 
- * If the software was purchased under a paid Alfresco license, the terms of 
- * the paid license agreement will prevail.  Otherwise, the software is 
- * provided under the following open source license terms:
- * 
- * Alfresco is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * Alfresco is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License for more details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
- * #L%
- */
+/*
+ * #%L
+ * Alfresco Repository
+ * %%
+ * Copyright (C) 2005 - 2016 Alfresco Software Limited
+ * %%
+ * This file is part of the Alfresco software. 
+ * If the software was purchased under a paid Alfresco license, the terms of 
+ * the paid license agreement will prevail.  Otherwise, the software is 
+ * provided under the following open source license terms:
+ * 
+ * Alfresco is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * Alfresco is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
+ * #L%
+ */
 
 package org.alfresco.repo.workflow.activiti;
 
@@ -107,4 +107,12 @@ public class AlfrescoProcessEngineConfiguration extends SpringProcessEngineConfi
     {
         this.unprotectedNodeService = unprotectedNodeService;
     }
+
+
+    @Override
+    public void initDatabaseType()
+    {
+        databaseTypeMappings.setProperty("MariaDB", DATABASE_TYPE_MYSQL);
+        super.initDatabaseType();
+    }
 }