diff --git a/stand/i386/common/cons.c b/stand/i386/common/cons.c
index 96e782fda5c9..25dda1ce7405 100644
--- a/stand/i386/common/cons.c
+++ b/stand/i386/common/cons.c
@@ -53,12 +53,38 @@ xputc(int c)
 		sio_putc(c);
 }
 
+static void
+getcursor(int *row, int *col)
+{
+	v86.ctl = V86_FLAGS;
+	v86.addr = 0x10;
+	v86.eax = 0x300;
+	v86.ebx = 0x7;
+	v86int();
+
+	if (row != NULL)
+		*row = v86.edx >> 8;
+	if (col != NULL)
+		*col = v86.edx & 0xff;
+}
+
 void
 putchar(int c)
 {
+	int i, col;
 
-	if (c == '\n')
+	switch (c) {
+	case '\n':
 		xputc('\r');
+		break;
+	case '\t':
+		col = 0;
+		getcursor(NULL, &col);
+		col = 8 - (col % 8);
+		for (i = 0; i < col; i++)
+			xputc(' ');
+		return;
+	}
 	xputc(c);
 }
 
@@ -100,7 +126,7 @@ int
 getchar(void)
 {
 
-	return (xgetc(0));
+	return (xgetc(0) & 0xff);
 }
 
 int