diff --git a/lib/core/dicts.py b/lib/core/dicts.py
index 48b2f9ca6..215675c83 100644
--- a/lib/core/dicts.py
+++ b/lib/core/dicts.py
@@ -20,6 +20,7 @@ from lib.core.settings import FIREBIRD_ALIASES
 from lib.core.settings import MAXDB_ALIASES
 from lib.core.settings import SYBASE_ALIASES
 from lib.core.settings import DB2_ALIASES
+from lib.core.settings import HSQL_ALIASES
 
 FIREBIRD_TYPES = {
                     "261": "BLOB",
@@ -137,6 +138,7 @@ DBMS_DICT = {
                 DBMS.MAXDB: (MAXDB_ALIASES, None, None, "maxdb"),
                 DBMS.SYBASE: (SYBASE_ALIASES, "python-pymssql", "http://pymssql.sourceforge.net/", "sybase"),
                 DBMS.DB2: (DB2_ALIASES, "python ibm-db", "http://code.google.com/p/ibm-db/", "ibm_db_sa"),
+                DBMS.HSQL: (HSQL_ALIASES, "python jaydebeapi", "https://pypi.python.org/pypi/JayDeBeApi/", "hsql"),
             }
 
 FROM_DUMMY_TABLE = {
@@ -145,6 +147,7 @@ FROM_DUMMY_TABLE = {
                         DBMS.FIREBIRD: " FROM RDB$DATABASE",
                         DBMS.MAXDB: " FROM VERSIONS",
                         DBMS.DB2: " FROM SYSIBM.SYSDUMMY1",
+                        DBMS.HSQL: " FROM INFORMATION_SYSTEM.SYSTEM_USERS"
                    }
 
 SQL_STATEMENTS = {
@@ -186,7 +189,8 @@ SQL_STATEMENTS = {
 
                         "SQL data execution":    (
                              "exec ",
-                             "execute ",         ),
+                             "execute ",
+                             "values ",          ),
 
                         "SQL transaction":       (
                              "start transaction ",