diff --git a/Netdisco/Changes b/Netdisco/Changes
index d41def76..cc7580da 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -11,6 +11,7 @@
   * Fix for device counts in VLAN Inventory report
   * Forward port housekeeping/schedule and expiry/expire legacy config
   * Store started timestamp on job completion
+  * Set UTF-8 mode and DBIC quoting on Pg database connection
 
 2.027007 - 2014-05-27
 
diff --git a/Netdisco/lib/App/Netdisco/Configuration.pm b/Netdisco/lib/App/Netdisco/Configuration.pm
index 7b5c484e..ff2f13ec 100644
--- a/Netdisco/lib/App/Netdisco/Configuration.pm
+++ b/Netdisco/lib/App/Netdisco/Configuration.pm
@@ -22,7 +22,9 @@ if (ref {} eq ref setting('database')) {
         options => {
             AutoCommit => 1,
             RaiseError => 1,
+            quote_names => 1,
             auto_savepoint => 1,
+            pg_enable_utf8 => 1,
         },
         schema_class => 'App::Netdisco::DB',
     };