diff --git a/config/alfresco/extension/custom-hibernate-dialect.properties.sample b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
index 062409faf6..9c1ea3b4ba 100644
--- a/config/alfresco/extension/custom-hibernate-dialect.properties.sample
+++ b/config/alfresco/extension/custom-hibernate-dialect.properties.sample
@@ -21,12 +21,12 @@
 #
 # Sybase dialect
 #
-#hibernate.dialect=org.hibernate.dialect.SybaseAnywhereDialect
+#hibernate.dialect=org.alfresco.repo.domain.hibernate.dialect.AlfrescoSybaseAnywhereDialect
 
 #
 # SQLServer dialect
 #
-#hibernate.dialect=org.hibernate.dialect.SQLServerDialect
+#hibernate.dialect=org.alfresco.repo.domain.hibernate.dialect.AlfrescoSQLServerDialect
 
 #
 # PostgreSQL dialect
diff --git a/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSQLServerDialect.java b/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSQLServerDialect.java
new file mode 100644
index 0000000000..e6f153b3c0
--- /dev/null
+++ b/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSQLServerDialect.java
@@ -0,0 +1,16 @@
+package org.alfresco.repo.domain.hibernate.dialect;
+
+import java.sql.Types;
+
+import org.hibernate.dialect.SQLServerDialect;
+
+public class AlfrescoSQLServerDialect extends SQLServerDialect
+{
+
+    public AlfrescoSQLServerDialect()
+    {
+        super();
+        registerColumnType( Types.VARCHAR, "nvarchar($l)" );
+    }
+
+}
diff --git a/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSybaseAnywhereDialect.java b/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSybaseAnywhereDialect.java
new file mode 100644
index 0000000000..c93ebb759d
--- /dev/null
+++ b/source/java/org/alfresco/repo/domain/hibernate/dialect/AlfrescoSybaseAnywhereDialect.java
@@ -0,0 +1,16 @@
+package org.alfresco.repo.domain.hibernate.dialect;
+
+import java.sql.Types;
+
+import org.hibernate.dialect.SybaseAnywhereDialect;
+
+public class AlfrescoSybaseAnywhereDialect extends SybaseAnywhereDialect
+{
+
+    public AlfrescoSybaseAnywhereDialect()
+    {
+        super();
+        registerColumnType( Types.VARCHAR, "text" );
+    }
+
+}