diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 0eef894c5171f1eb146a5d599754310f9596d29a..6273e4e8b22937a5c8749240be35f1819e68d49a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,6 @@
 Skinr 6.x-2.x, xxxx-xx-xx
 -------------------------
+Issue #1221336 by n3ko: Fixed error with pg database when upgrading from v1.6.
 Issue #943782 by moonray, Dane Powell, rfay, Alexander Allen, Jacine |
   Melissamcewen: _system_theme_data() causes PHP notices, but system_theme_data()
   causes themes to be disabled on update.
diff --git a/skinr.install b/skinr.install
index 2cc9471b29fb4d39144db87c894178162af6ab8f..96d12fbb7db5ff67bc057ddf0960fc1a53721e8e 100644
--- a/skinr.install
+++ b/skinr.install
@@ -281,7 +281,7 @@ function skinr_update_6003() {
  */
 function skinr_update_6004() {
   $ret = array();
-  $ret[] = update_sql("UPDATE {skinr} SET sid = REPLACE(sid, '-panel-', '-region-') WHERE module = 'panels' && sid LIKE '%-panel-%'");
+  $ret[] = update_sql("UPDATE {skinr} SET sid = REPLACE(sid, '-panel-', '-region-') WHERE module = 'panels' AND sid LIKE '%-panel-%'");
 
   return $ret;
 }