diff --git a/sites/all/modules/page_title/CHANGELOG.txt b/sites/all/modules/page_title_new/CHANGELOG.txt
diff --git a/sites/all/modules/page_title/LICENSE.txt b/sites/all/modules/page_title_new/LICENSE.txt
diff --git a/sites/all/modules/page_title/README.txt b/sites/all/modules/page_title_new/README.txt
diff --git a/sites/all/modules/page_title/page_title.admin.inc b/sites/all/modules/page_title_new/page_title.admin.inc
diff --git a/sites/all/modules/page_title/page_title.info b/sites/all/modules/page_title_new/page_title.info
diff --git a/sites/all/modules/page_title/page_title.install b/sites/all/modules/page_title_new/page_title.install
index a6ba2d7..1be43bc 100755
--- a/sites/all/modules/page_title/page_title.install
+++ b/sites/all/modules/page_title_new/page_title.install
@@ -133,6 +133,19 @@ function page_title_update_5203() {
                              PRIMARY KEY (type, id)
                            ) /*!40100 DEFAULT CHARACTER SET utf8 */;');
       $ret[] = update_sql('INSERT INTO {page_title} (id, page_title) SELECT nid, page_title FROM {page_title_old}');
+      $ret[] = update_sql('DROP TABLE {page_title_old}');
+
+    case 'pgsql':
+      $ret[] = update_sql('CREATE TABLE {page_title_old} AS SELECT * FROM {page_title}');
+      $ret[] = update_sql('DROP TABLE {page_title}');
+      $ret[] = update_sql("CREATE TABLE {page_title} (
+                             type VARCHAR(15) NOT NULL DEFAULT 'node',
+                             id INT NOT NULL DEFAULT 0,
+                             page_title VARCHAR(255) NOT NULL,
+                             PRIMARY KEY (type, id)
+                           )");
+      $ret[] = update_sql('INSERT INTO {page_title} (id, page_title) SELECT nid, page_title FROM {page_title_old}');
+      $ret[] = update_sql('DROP TABLE {page_title_old}');
   }
 
   return $ret;
diff --git a/sites/all/modules/page_title/page_title.module b/sites/all/modules/page_title_new/page_title.module
index 5103063..4fdd971 100644
--- a/sites/all/modules/page_title/page_title.module
+++ b/sites/all/modules/page_title_new/page_title.module
@@ -198,17 +198,17 @@ function page_title_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) {
   switch ($op) {
     case 'update':
       if (user_access('set page title')) {
-        db_query("DELETE FROM {page_title} WHERE type = 'node' AND id = %d", $node->nid);
+        db_query('DELETE FROM {page_title} WHERE type = "node" AND id = %d', $node->nid);
       }
       // fallthrough to insert intentional!
     case 'insert':
       if (isset($node->page_title) && drupal_strlen(trim($node->page_title)) > 0 && user_access('set page title')) {
-        db_query("INSERT INTO {page_title} VALUES ('node', %d, '%s')", $node->nid, $node->page_title);
+        db_query('INSERT INTO {page_title} VALUES ("node", %d, "%s")', $node->nid, $node->page_title);
       }
       break;
 
     case 'delete':
-      db_query("DELETE FROM {page_title} WHERE type = 'node' AND id = %d", $node->nid);
+      db_query('DELETE FROM {page_title} WHERE type = "node" AND id = %d', $node->nid);
       break;
 
     case 'load':
@@ -226,17 +226,17 @@ function page_title_taxonomy($op, $type, $edit) {
   switch ($op) {
     case 'update':
       if (user_access('set page title')) {
-        db_query("DELETE FROM {page_title} WHERE type = 'term' AND id = %d", $edit['tid']);
+        db_query('DELETE FROM {page_title} WHERE type = "term" AND id = %d', $edit['tid']);
       }
       // Fallthrough to insert is intentional!
     case 'insert':
       if (isset($edit['page_title']) && drupal_strlen(trim($edit['page_title'])) > 0 && user_access('set page title')) {
-        db_query("INSERT INTO {page_title} VALUES('term', %d, '%s')", $edit['tid'], $edit['page_title']);
+        db_query('INSERT INTO {page_title} VALUES("term", %d, "%s")', $edit['tid'], $edit['page_title']);
       }
       break;
 
     case 'delete':
-      db_query("DELETE FROM {page_title} WHERE type = 'term' AND id = %d", $edit['tid']);
+      db_query('DELETE FROM {page_title} WHERE type = "term" AND id = %d', $edit['tid']);
       break;
   }
 }
@@ -249,17 +249,17 @@ function page_title_user($op, &$edit, &$account) {
   switch ($op) {
     case 'update':
       if (user_access('set page title')) {
-        db_query("DELETE FROM {page_title} WHERE type = 'user' AND id = %d", $account->uid);
+        db_query('DELETE FROM {page_title} WHERE type = "user" AND id = %d', $account->uid);
       }
       // Fallthrough to insert is intentional!
     case 'insert':
       if (isset($edit['page_title']) && drupal_strlen(trim($edit['page_title'])) > 0 && user_access('set page title')) {
-        db_query("INSERT INTO {page_title} VALUES('user', %d, '%s')", $account->uid, $edit['page_title']);
+        db_query('INSERT INTO {page_title} VALUES("user", %d, "%s")', $account->uid, $edit['page_title']);
       }
       break;
 
     case 'delete':
-      db_query("DELETE FROM {page_title} WHERE type = 'user' AND id = %d", $account->uid);
+      db_query('DELETE FROM {page_title} WHERE type = "user" AND id = %d', $account->uid);
       break;
   }
 }
diff --git a/sites/all/modules/page_title/po/page_title.pot b/sites/all/modules/page_title_new/po/page_title.pot
diff --git a/sites/all/modules/page_title/po/ru.po b/sites/all/modules/page_title_new/po/ru.po
diff --git a/sites/all/modules/page_title/template.php b/sites/all/modules/page_title_new/template.php