diff --git a/src/pgsql/merge-catalogs.lisp b/src/pgsql/merge-catalogs.lisp
index 54baa5d..8e7c7e5 100644
--- a/src/pgsql/merge-catalogs.lisp
+++ b/src/pgsql/merge-catalogs.lisp
@@ -37,7 +37,8 @@
 
              (loop :for source-table :in (schema-table-list source-schema)
                 :for target-table := (find-table target-schema
-                                                 (table-name source-table))
+                                                 (ensure-unquoted
+                                                  (table-name source-table)))
                 :do (if target-table
                         (progn
                           ;; re-use indexes and fkeys from target-catalog
diff --git a/src/pgsql/pgsql-schema.lisp b/src/pgsql/pgsql-schema.lisp
index 3907a37..9f2aca6 100644
--- a/src/pgsql/pgsql-schema.lisp
+++ b/src/pgsql/pgsql-schema.lisp
@@ -8,7 +8,8 @@
                             &key table source-catalog including excluding)
   "Fetch PostgreSQL catalogs for the target database. A PostgreSQL
    connection must be opened."
-  (let* ((catalog   (make-catalog :name dbname))
+  (let* ((*identifier-case* :none)
+         (catalog   (make-catalog :name dbname))
          (including (cond ((and table (not including))
                            (make-including-expr-from-table table))