diff --git a/ChangeLog b/ChangeLog
index ab59924da..fa2593728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-09  Eric Anholt  <anholt@FreeBSD.org>
+
+	* configure.ac:
+	* hw/kdrive/linux/Makefile.am:
+	* hw/kdrive/linux/agp.c:
+	* hw/kdrive/src/Makefile.am:
+	Make kdrive (i.e. Xephyr only) buildable on FreeBSD and probably other
+	OSes without linux VT switching, fbdev, and vm86 support.
+
 2006-02-09  Eric Anholt  <anholt@FreeBSD.org>
 
 	* GL/glx/indirect_reqsize.c:
diff --git a/configure.ac b/configure.ac
index c92336182..81038a583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,7 @@ AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes])
 AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes])
 
 DRI=no
+KDRIVE_HW=no
 dnl it would be nice to autodetect these *CONS_SUPPORTs
 case $host_os in
   *freebsd*)
@@ -243,8 +244,10 @@ case $host_os in
 	;;
   *linux*)
 	DRI=yes
+	KDRIVE_HW=yes
 	;;
 esac
+AM_CONDITIONAL(KDRIVE_HW, test "x$KDRIVE_HW" = xyes)
 
 AC_MSG_CHECKING(for MMX capable platform)
 if test "x$use_x86_asm" = xyes && test "x$GCC" = xyes ; then
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index cf3183b8f..4243a1124 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -13,17 +13,22 @@ if H3600_TS
 TS_C = ts.c
 endif
 
+if KDRIVE_HW
+KDRIVE_HW_SOURCES =	\
+	evdev.c		\
+	keyboard.c	\
+	linux.c
+endif
+
 liblinux_a_SOURCES = 	\
 	agp.c		\
 	agp.h		\
 	bus.c		\
-	keyboard.c	\
 	klinux.h	\
-	linux.c		\
 	mouse.c		\
-	evdev.c		\
 	ms.c		\
 	ps2.c		\
+	$(KDRIVE_HW_SOURCES) \
 	$(TSLIB_C)	\
 	$(TS_C)
 
diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c
index a874c7d4b..c2ae62568 100644
--- a/hw/kdrive/linux/agp.c
+++ b/hw/kdrive/linux/agp.c
@@ -45,6 +45,7 @@ of the copyright holder.
 #include <kdrive-config.h>
 #endif
 #include <X11/X.h>
+#include "misc.h"
 
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 192665ec2..872d29551 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -4,6 +4,12 @@ INCLUDES = 					\
 
 noinst_LIBRARIES = libkdrive.a libkdrivestubs.a
 
+if KDRIVE_HW
+KDRIVE_HW_SOURCES =	\
+	vga.c		\
+	vga.h
+endif
+
 libkdrive_a_SOURCES =	\
 	fourcc.h	\
 	kaa.c		\
@@ -25,8 +31,7 @@ libkdrive_a_SOURCES =	\
 	ktest.c		\
 	kxv.c		\
 	kxv.h		\
-	vga.c		\
-	vga.h           \
+	$(KDRIVE_HW_SOURCES) \
         $(top_srcdir)/mi/miinitext.c
 
 libkdrivestubs_a_SOURCES = \