2 files changed, 6 insertions, 7 deletions

diff --git a/src/gnsrecord/gnsrecord_misc.c b/src/gnsrecord/gnsrecord_misc.c
index b63142d5a..70a3f645e 100644
--- a/src/gnsrecord/gnsrecord_misc.c
+++ b/src/gnsrecord/gnsrecord_misc.c
@@ -40,7 +40,7 @@
 char *
 GNUNET_GNSRECORD_string_normalize (const char *src)
 {
-  /*FIXME: We may want to follow RFC3491 a bit more (Nameprep)*/
+  /*FIXME: We may want to follow RFC5890/RFC5891 */
   return GNUNET_STRINGS_utf8_normalize (src);
 }
 
diff --git a/src/util/strings.c b/src/util/strings.c
index 75e45ba6d..a77f09022 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -432,12 +432,11 @@ GNUNET_STRINGS_utf8_normalize (const char *input)
   uint8_t *tmp;
   size_t len;
   char *output;
-  tmp = u8_tolower ((uint8_t *) input,
-                    strlen ((char *) input),
-                    NULL,
-                    UNINORM_NFKC,
-                    NULL,
-                    &len);
+  tmp = u8_normalize (UNINORM_NFC,
+                      (uint8_t *) input,
+                      strlen ((char*) input),
+                      NULL,
+                      &len);
   if (NULL == tmp)
     return NULL;
   output = GNUNET_malloc (len + 1);