--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
+++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
@@ -164,7 +164,11 @@
 
         if (ioBase != MAP_FAILED)
         {
+#if defined(__FreeBSD__)
+		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
+#else
                 munmap(__UNVOLATILE(ioBase), 0x10000);
+#endif
                 ioBase = MAP_FAILED;
         }
 }
--- hw/xfree86/int10/Makefile.in.orig	2008-01-02 12:30:05.000000000 +0000
+++ hw/xfree86/int10/Makefile.in	2008-01-02 12:30:46.000000000 +0000
@@ -400,7 +400,7 @@
 @INT10_VM86_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_VM86_LINUX $(DIX_CFLAGS) $(XORG_CFLAGS) $(EXTRA_CFLAGS)
 @INT10_X86EMU_TRUE@AM_CFLAGS = $(I386_VIDEO_CFLAGS) -D_X86EMU -DNO_SYS_HEADERS \
 @INT10_X86EMU_TRUE@           $(XORG_CFLAGS) $(EXTRA_CFLAGS) $(DIX_CFLAGS)
-
+@INT10_STUB_TRUE@INCLUDES = $(XORG_INCS)
 @INT10_VM86_TRUE@INCLUDES = $(XORG_INCS)
 @INT10_X86EMU_TRUE@INCLUDES = $(XORG_INCS) -I$(srcdir)/../x86emu
 @INT10_STUB_TRUE@libint10_la_SOURCES = stub.c xf86int10module.c