diff --git a/Changelog.md b/Changelog.md
index b0dceda..057df31 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
  * `docker exec` is now the default and recommended mechanism for running commands in the container. SSH is now disabled by default, but is still supported for those cases where "docker exec" is not appropriate. Closes GH-168.
  * The workaround for Docker bug 2267 (the inability to modify /etc/hosts) has been removed, because it has been fixed upstream. Closes GH-155.
  * Logrotate now reloads syslog-ng properly. Closes GH-167.
+ * Fixed some locale issues. Closes GH-178. Thanks to David J. M. Karlsen.
 
 ## 0.9.15 (release date: 2014-10-03)
 
diff --git a/image/prepare.sh b/image/prepare.sh
index 5e5d188..8166fa5 100755
--- a/image/prepare.sh
+++ b/image/prepare.sh
@@ -44,3 +44,4 @@ apt-get dist-upgrade -y --no-install-recommends
 ## Fix locale.
 $minimal_apt_get_install language-pack-en
 locale-gen en_US
+update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8