diff --git a/conf/any-emu.rmk b/conf/any-emu.rmk
index f99b36c07..c3d14ca7a 100644
--- a/conf/any-emu.rmk
+++ b/conf/any-emu.rmk
@@ -28,6 +28,7 @@ grub_emu_SOURCES = commands/minicmd.c commands/cat.c commands/cmp.c	\
 	normal/completion.c normal/main.c normal/color.c		\
 	normal/menu.c normal/menu_entry.c normal/menu_viewer.c		\
 	normal/menu_text.c normal/crypto.c normal/term.c		\
+	commands/terminal.c lib/charset.c \
 	script/main.c script/execute.c script/function.c		\
 	script/lexer.c script/script.c grub_script.tab.c		\
 	partmap/amiga.c	partmap/apple.c partmap/msdos.c partmap/sun.c	\
diff --git a/kern/term.c b/kern/term.c
index 69a23f48a..b381d9336 100644
--- a/kern/term.c
+++ b/kern/term.c
@@ -45,9 +45,9 @@ grub_putcode (grub_uint32_t code, struct grub_term_output *term)
       return;
     }
 
+  (term->putchar) (code);
   if (code == '\n')
     (term->putchar) ('\r');
-  (term->putchar) (code);
 }
 
 /* Put a character. C is one byte of a UTF-8 stream.
diff --git a/normal/term.c b/normal/term.c
index b099ae84c..667d27ee9 100644
--- a/normal/term.c
+++ b/normal/term.c
@@ -167,7 +167,7 @@ read_terminal_list (void)
       return;
     }
   
-  filename = grub_malloc (grub_strlen (prefix) + sizeof ("/crypto.lst"));
+  filename = grub_malloc (grub_strlen (prefix) + sizeof ("/terminal.lst"));
   if (!filename)
     {
       grub_errno = GRUB_ERR_NONE;
diff --git a/util/console.c b/util/console.c
index 40ee3a638..73195765e 100644
--- a/util/console.c
+++ b/util/console.c
@@ -19,14 +19,6 @@
 
 #include <config.h>
 
-#if defined(HAVE_NCURSES_CURSES_H)
-# include <ncurses/curses.h>
-#elif defined(HAVE_NCURSES_H)
-# include <ncurses.h>
-#elif defined(HAVE_CURSES_H)
-# include <curses.h>
-#endif
-
 /* For compatibility.  */
 #ifndef A_NORMAL
 # define A_NORMAL	0
@@ -39,6 +31,14 @@
 #include <grub/term.h>
 #include <grub/types.h>
 
+#if defined(HAVE_NCURSES_CURSES_H)
+# include <ncurses/curses.h>
+#elif defined(HAVE_NCURSES_H)
+# include <ncurses.h>
+#elif defined(HAVE_CURSES_H)
+# include <curses.h>
+#endif
+
 static int grub_console_attr = A_NORMAL;
 
 grub_uint8_t grub_console_cur_color = 7;