diff --git a/CHANGELOG b/CHANGELOG
index cc7d000b..c70e1c44 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,5 @@
 HEAD:
+          Wiki search handles multibyte (UTF-8) characters correctly
           Ported to ActionPack
           Madeleine will check every hour if there are new commands in the log or 24 hours have 
           passed since last snapshot, and take snapshot if either of these conditions is true
diff --git a/config/environment.rb b/config/environment.rb
index 30238d9b..7fe11d1e 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -3,6 +3,9 @@ if RUBY_VERSION < '1.8.1'
   exit
 end
 
+# Enable UTF-8 support
+$KCODE = 'u'
+
 RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + '/../') unless defined? RAILS_ROOT
 RAILS_ENV  = ENV['RAILS_ENV'] || 'production' unless defined? RAILS_ENV