diff --git a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
index fea3fa57..3809cd16 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxdriver.cpp
@@ -133,8 +133,10 @@ bool pqxxSqlDriver::isSystemDatabaseName( const TQString& n ) const
 //
 TQString pqxxSqlDriver::escapeString( const TQString& str) const
 {
+    TQString escaped = str;
+    escaped.replace("'", "''");
     return TQString::fromLatin1("'")
-    	+ TQString::fromAscii( pqxx::sqlesc(std::string(str.utf8())).c_str() )
+    	+ escaped
     	+ TQString::fromLatin1("'");
 }
 
@@ -142,8 +144,10 @@ TQString pqxxSqlDriver::escapeString( const TQString& str) const
 //
 TQCString pqxxSqlDriver::escapeString( const TQCString& str) const
 {
+    TQString escaped = str;
+    escaped.replace("'", "''");
     return TQCString("'")
-    	+ TQCString( pqxx::sqlesc(TQString(str).ascii()).c_str() )
+    	+ TQCString( escaped.ascii() )
     	+ TQCString("'");
 }