diff --git a/contrib/unaccent/expected/unaccent.out b/contrib/unaccent/expected/unaccent.out
index b93105e9c7c..0835e141afb 100644
--- a/contrib/unaccent/expected/unaccent.out
+++ b/contrib/unaccent/expected/unaccent.out
@@ -6,23 +6,23 @@ SELECT getdatabaseencoding();
  UTF8
 (1 row)
 
-SET client_encoding TO 'KOI8';
+SET client_encoding TO 'UTF8';
 SELECT unaccent('foobar');
  unaccent 
 ----------
  foobar
 (1 row)
 
-SELECT unaccent('£ΜΛΑ');
+SELECT unaccent('Ρ‘Π»ΠΊΠ°');
  unaccent 
 ----------
- ΕΜΛΑ
+ Π΅Π»ΠΊΠ°
 (1 row)
 
-SELECT unaccent('³φιλ');
+SELECT unaccent('ΠΠ–Π˜Πš');
  unaccent 
 ----------
- εφιλ
+ Π•Π–Π˜Πš
 (1 row)
 
 SELECT unaccent('unaccent', 'foobar');
@@ -31,16 +31,16 @@ SELECT unaccent('unaccent', 'foobar');
  foobar
 (1 row)
 
-SELECT unaccent('unaccent', '£ΜΛΑ');
+SELECT unaccent('unaccent', 'Ρ‘Π»ΠΊΠ°');
  unaccent 
 ----------
- ΕΜΛΑ
+ Π΅Π»ΠΊΠ°
 (1 row)
 
-SELECT unaccent('unaccent', '³φιλ');
+SELECT unaccent('unaccent', 'ΠΠ–Π˜Πš');
  unaccent 
 ----------
- εφιλ
+ Π•Π–Π˜Πš
 (1 row)
 
 SELECT ts_lexize('unaccent', 'foobar');
@@ -49,15 +49,15 @@ SELECT ts_lexize('unaccent', 'foobar');
  
 (1 row)
 
-SELECT ts_lexize('unaccent', '£ΜΛΑ');
+SELECT ts_lexize('unaccent', 'Ρ‘Π»ΠΊΠ°');
  ts_lexize 
 -----------
- {ΕΜΛΑ}
+ {Π΅Π»ΠΊΠ°}
 (1 row)
 
-SELECT ts_lexize('unaccent', '³φιλ');
+SELECT ts_lexize('unaccent', 'ΠΠ–Π˜Πš');
  ts_lexize 
 -----------
- {εφιλ}
+ {Π•Π–Π˜Πš}
 (1 row)
 
diff --git a/contrib/unaccent/sql/unaccent.sql b/contrib/unaccent/sql/unaccent.sql
index 310213994f3..ba72ab6261c 100644
--- a/contrib/unaccent/sql/unaccent.sql
+++ b/contrib/unaccent/sql/unaccent.sql
@@ -3,16 +3,16 @@ CREATE EXTENSION unaccent;
 -- must have a UTF8 database
 SELECT getdatabaseencoding();
 
-SET client_encoding TO 'KOI8';
+SET client_encoding TO 'UTF8';
 
 SELECT unaccent('foobar');
-SELECT unaccent('£ΜΛΑ');
-SELECT unaccent('³φιλ');
+SELECT unaccent('Ρ‘Π»ΠΊΠ°');
+SELECT unaccent('ΠΠ–Π˜Πš');
 
 SELECT unaccent('unaccent', 'foobar');
-SELECT unaccent('unaccent', '£ΜΛΑ');
-SELECT unaccent('unaccent', '³φιλ');
+SELECT unaccent('unaccent', 'Ρ‘Π»ΠΊΠ°');
+SELECT unaccent('unaccent', 'ΠΠ–Π˜Πš');
 
 SELECT ts_lexize('unaccent', 'foobar');
-SELECT ts_lexize('unaccent', '£ΜΛΑ');
-SELECT ts_lexize('unaccent', '³φιλ');
+SELECT ts_lexize('unaccent', 'Ρ‘Π»ΠΊΠ°');
+SELECT ts_lexize('unaccent', 'ΠΠ–Π˜Πš');