diff --git a/SRC/echoping.c b/SRC/echoping.c
index 84efe74..7e16a3d 100644
--- a/SRC/echoping.c
+++ b/SRC/echoping.c
@@ -427,6 +427,7 @@ main (argc, argv)
   server = argv[0];
 #ifdef IDN
   locale_server = server;
+  /* TODO: segfaults if the locale is invalid */
   utf8_server = stringprep_locale_to_utf8 (server);
   server = utf8_server;
 #endif
diff --git a/SRC/test-echoping-idn b/SRC/test-echoping-idn
new file mode 100644
index 0000000..9b8b101
--- /dev/null
+++ b/SRC/test-echoping-idn
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# $Id$
+
+echo ""
+echo "Since this tests tries remote servers, a failure is not always "
+echo " echoping's fault: it may be a network problem."
+echo ""
+echo "For this specific test, you *must* set the locale to UTF-8. It is system-"
+echo "dependent but you typically 'export LC_CTYPE=xx_XX.utf8'. 'locale -a' to get"
+echo "possible values."
+
+./echoping -h / -v café.gennic.net
+