diff --git a/stage2/console.c b/stage2/console.c
new file mode 100644
index 000000000..bafb55b88
--- /dev/null
+++ b/stage2/console.c
@@ -0,0 +1,48 @@
+/* term_console.c - console input and output */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002  Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <shared.h>
+#include <term.h>
+
+/* These functions are defined in asm.S instead of this file:
+   console_putchar, console_checkkey, console_getkey, console_getxy,
+   console_gotoxy, console_cls, and console_nocursor.  */
+
+int console_current_color = A_NORMAL;
+static int console_normal_color = A_NORMAL;
+static int console_highlight_color = A_REVERSE;
+static int console_highlight_state = 0;
+
+void
+console_highlight (int state)
+{
+  console_current_color
+    = state ? console_highlight_color : console_normal_color;
+  console_highlight_state = state;
+}
+
+void
+console_setcolor (int normal_color, int highlight_color)
+{
+  console_normal_color = normal_color;
+  console_highlight_color = highlight_color;
+
+  console_highlight (console_highlight_state);
+}
diff --git a/stage2/term.h b/stage2/term.h
new file mode 100644
index 000000000..c66bc54b1
--- /dev/null
+++ b/stage2/term.h
@@ -0,0 +1,114 @@
+/* term.h - definitions for terminal handling */
+/*
+ *  GRUB  --  GRand Unified Bootloader
+ *  Copyright (C) 2002  Free Software Foundation, Inc.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#ifndef GRUB_TERM_HEADER
+#define GRUB_TERM_HEADER	1
+
+#ifndef STAGE1_5
+
+/* Flags for representing the capabilities of a terminal.  */
+/* Some notes about the flags:
+   - These flags are used by higher-level functions but not terminals
+   themselves.
+   - If a terminal is dumb, you may assume that only putchar, getkey and
+   checkkey are called.
+   - Some fancy features (nocursor, setcolor, and highlight) can be set to
+   NULL.  */
+
+/* Set when input characters shouldn't be echoed back.  */
+#define TERM_NO_ECHO		(1 << 0)
+/* Set when the editing feature should be disabled.  */
+#define TERM_NO_EDIT		(1 << 1)
+/* Set when the terminal cannot do fancy things.  */
+#define TERM_DUMB		(1 << 2)
+/* Set when the terminal needs to be initialized.  */
+#define TERM_NEED_INIT		(1 << 16)
+
+struct term_entry
+{
+  /* The name of a terminal.  */
+  const char *name;
+  /* The feature flags defined above.  */
+  unsigned long flags;
+  /* Put a character.  */
+  void (*putchar) (int c);
+  /* Check if any input character is available.  */
+  int (*checkkey) (void);
+  /* Get a character.  */
+  int (*getkey) (void);
+  /* Get the cursor position. The return value is ((X << 8) | Y).  */
+  int (*getxy) (void);
+  /* Go to the position (X, Y).  */
+  void (*gotoxy) (int x, int y);
+  /* Clear the screen.  */
+  void (*cls) (void);
+  /* Highlight characters written after this call, if STATE is true.  */
+  void (*highlight) (int state);
+  /* Set the normal color and the highlight color. The format of each
+     color is VGA's.  */
+  void (*setcolor) (int normal_color, int highlight_color);
+  /* Don't show the cursor.  */
+  void (*nocursor) (void);
+};
+
+/* This lists up available terminals.  */
+extern struct term_entry term_table[];
+/* This points to the current terminal. This is useful, because only
+   a single terminal is enabled normally.  */
+extern struct term_entry *current_term;
+
+#endif /* ! STAGE1_5 */
+
+/* The console stuff.  */
+extern int console_current_color;
+void console_putchar (int c);
+
+#ifndef STAGE1_5
+int console_checkkey (void);
+int console_getkey (void);
+int console_getxy (void);
+void console_gotoxy (int x, int y);
+void console_cls (void);
+void console_highlight (int state);
+void console_setcolor (int normal_color, int highlight_color);
+void console_nocursor (void);
+#endif
+
+#ifdef SUPPORT_SERIAL
+void serial_putchar (int c);
+int serial_checkkey (void);
+int serial_getkey (void);
+int serial_getxy (void);
+void serial_gotoxy (int x, int y);
+void serial_cls (void);
+void serial_highlight (int state);
+#endif
+
+#ifdef SUPPORT_HERCULES
+void hercules_putchar (int c);
+int hercules_getxy (void);
+void hercules_gotoxy (int x, int y);
+void hercules_cls (void);
+void hercules_highlight (int state);
+void hercules_setcolor (int normal_color, int highlight_color);
+void hercules_nocursor (void);
+#endif
+
+#endif /* ! GRUB_TERM_HEADER */