diff -Naurp bind-9.9.5/bin/dig/dighost.c bind-9.9.5.oden/bin/dig/dighost.c
--- bind-9.9.5/bin/dig/dighost.c	2014-02-02 14:00:32.283250782 +0100
+++ bind-9.9.5.oden/bin/dig/dighost.c	2014-02-02 14:00:41.849251317 +0100
@@ -4127,6 +4127,15 @@ output_filter (isc_buffer_t *buffer, uns
 	(void) strcpy (tmp1, tmp2);
 	free (tmp2);
 
+	tmp2 = stringprep_utf8_to_locale (tmp1);
+	if (tmp2 == NULL) {
+		debug ("output_filter: stringprep_utf8_to_locale failed");
+		return ISC_R_SUCCESS;
+	}
+
+	(void) strcpy (tmp1, tmp2);
+	free (tmp2);
+
         tolen = strlen (tmp1);
         if (absolute && !end_with_dot && tmp1[tolen - 1] == '.')
                 tolen--;