--- programs/Xserver/hw/xfree86/common/Imakefile.orig	Mon Feb 17 12:06:41 2003
+++ programs/Xserver/hw/xfree86/common/Imakefile	Thu May 15 20:17:15 2003
@@ -18,7 +18,8 @@
 #endif /* GNUMachArchitecture */
 #else
 # if defined(i386BsdArchitecture) || defined(AlphaBsdArchitecture) \
-	|| defined(OpenBSDArchitecture) || defined(NetBSDArchitecture)
+	|| defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) \
+	|| defined(FreeBSDArchitecture)
         KBD = xf86KbdBSD
 # else
 #  ifdef LinuxArchitecture
@@ -29,7 +30,7 @@
 # endif
 #endif
 
-#ifdef SparcArchitecture
+#if defined(SparcArchitecture) || defined(Sparc64Architecture)
         SBUSSRC = xf86sbusBus.c
         SBUSOBJ = xf86sbusBus.o
 #endif