Index: kernel/arch/ia64/src/ski/ski.c
===================================================================
--- kernel/arch/ia64/src/ski/ski.c	(revision c640876a2871d801c859155f90c27f4d2ff40c11)
+++ kernel/arch/ia64/src/ski/ski.c	(revision 2398ee96220787bd3b0438d6024bbe76cd7a5e82)
@@ -42,4 +42,5 @@
 #include <arch/asm.h>
 #include <arch/drivers/kbd.h>
+#include <string.h>
 #include <arch.h>
 
@@ -49,4 +50,16 @@
 static bool kbd_disabled;
 
+static void ski_do_putchar(const wchar_t ch)
+{
+	asm volatile (
+		"mov r15 = %[cmd]\n"
+		"mov r32 = %[ch]\n"   /* r32 is in0 */
+		"break 0x80000\n"  /* modifies r8 */
+		:
+		: [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch)
+		: "r15", "in0", "r8"
+	);
+}
+
 /** Display character on debug console
  *
@@ -57,18 +70,14 @@
  * @param ch Character to be printed.
  */
-static void ski_putchar(outdev_t *d, const char ch, bool silent)
+static void ski_putchar(outdev_t *d, const wchar_t ch, bool silent)
 {
 	if (!silent) {
-		asm volatile (
-			"mov r15 = %0\n"
-			"mov r32 = %1\n"   /* r32 is in0 */
-			"break 0x80000\n"  /* modifies r8 */
-			:
-			: "i" (SKI_PUTCHAR), "r" (ch)
-			: "r15", "in0", "r8"
-		);
-		
-		if (ch == '\n')
-			ski_putchar(d, '\r', false);
+		if (ascii_check(ch)) {
+			if (ch == '\n')
+				ski_do_putchar('\r');
+			
+			ski_do_putchar(ch);
+		} else
+			ski_do_putchar(invalch);
 	}
 }