diff -ruN /home/asmodai/sources/xorg/xc/config/cf/Imakefile xc/config/cf/Imakefile
--- /home/asmodai/sources/xorg/xc/config/cf/Imakefile	2004-10-13 18:47:28.000000000 +0200
+++ xc/config/cf/Imakefile	2004-10-27 01:54:32.000000000 +0200
@@ -91,6 +91,7 @@
 Imake.cf \
 Amoeba.cf \
 DGUX.cf \
+DragonFly.cf \
 FreeBSD.cf \
 Mips.cf \
 NetBSD.cf \
diff -ruN /home/asmodai/sources/xorg/xc/config/imake/imake.c xc/config/imake/imake.c
--- /home/asmodai/sources/xorg/xc/config/imake/imake.c	2004-10-10 00:04:13.000000000 +0200
+++ xc/config/imake/imake.c	2004-10-27 01:50:23.000000000 +0200
@@ -145,7 +145,7 @@
  *	#include INCLUDE_IMAKEFILE
  *	<add any global targets like 'clean' and long dependencies>
  */
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 /* This needs to be before _POSIX_SOURCE gets defined */
 # include <sys/param.h>
 # include <sys/types.h>
@@ -1020,7 +1020,7 @@
 }
 #endif
 
-#if defined(__OpenBSD__) 
+#if defined(__OpenBSD__) || defined(__DragonFly__)
 static void
 get_stackprotector(FILE *inFile)
 {
@@ -1351,6 +1351,7 @@
      defined(__NetBSD__) || \
      defined(__OpenBSD__) || \
      defined(__FreeBSD__) || \
+     defined(__DragonFly__) || \
      defined(__APPLE__) || \
      defined(__GNU__)
 	"/usr/bin/cc",	/* for Linux PostIncDir */
@@ -1684,7 +1685,7 @@
       fprintf(inFile, "#define DefaultOSTeenyVersion 0\n");
     }
 #endif /* EMX */
-#if defined(__OpenBSD__)
+#if defined(__OpenBSD__) || defined(__DragonFly__
   get_stackprotector(inFile);
 #endif
   return FALSE;
diff -ruN /home/asmodai/sources/xorg/xc/config/imake/imakemdep.h xc/config/imake/imakemdep.h
--- /home/asmodai/sources/xorg/xc/config/imake/imakemdep.h	2004-10-19 15:50:06.000000000 +0200
+++ xc/config/imake/imakemdep.h	2004-10-27 01:53:46.000000000 +0200
@@ -285,7 +285,7 @@
 #if defined(__386BSD__)
 #define DEFAULT_CPP "/usr/libexec/cpp"
 #endif
-#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__)
+#if defined(__FreeBSD__)  || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 #define USE_CC_E
 #endif
 #if defined(__sgi) && defined(__ANSI_CPP__)
@@ -348,8 +348,8 @@
 #endif
 #endif
 #if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || \
-    defined(__FreeBSD__) || defined(MACH) || defined(linux) || \
-    defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
+    defined(__FreeBSD__) || defined(__DragonFly__) || defined(MACH) || \
+    defined(linux) || defined(__GNU__) || defined(__bsdi__) || defined(__GNUC__)
 # ifdef __i386__
 	"-D__i386__",
 #  if defined(__GNUC__) && (__GNUC__ >= 3)
@@ -819,14 +819,14 @@
 #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
 #  define DEFAULT_OS_TEENY_REV   "v %[0-9]" 
 /* # define DEFAULT_OS_NAME        "srm %[^\n]" */ /* Not useful on ISC */
-# elif defined(__FreeBSD__) || defined(__OpenBSD__)
+# elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 /* BSD/OS too? */
 /* uname -r returns "x.y[.z]-mumble", e.g. "2.1.5-RELEASE" or "2.2-0801SNAP" */
 #  define DEFAULT_OS_MAJOR_REV   "r %[0-9]"
 #  define DEFAULT_OS_MINOR_REV   "r %*d.%[0-9]"
 #  define DEFAULT_OS_TEENY_REV   "r %*d.%*d.%[0-9]" 
 #  define DEFAULT_OS_NAME        "srm %[^\n]"
-#  if defined(__FreeBSD__)
+#  if defined(__FreeBSD__) || defined(__DragonFly__)
 /* Use an alternate way to find the teeny version for -STABLE, -SNAP versions */
 #   ifndef CROSSCOMPILE_CPP
 #    define DEFAULT_OS_TEENY_REV_FROB(buf, size)			\
@@ -1240,6 +1240,9 @@
 #ifdef _MIPS_SZPTR
 	{"_MIPS_SZPTR", DEF_STRINGIFY(_MIPS_SZPTR)},
 #endif
+#ifdef __DragonFly__
+	{"__DragonFly__", "1"},
+#endif
 #ifdef __FreeBSD__
 	{"__FreeBSD__", "1"},
 #endif
@@ -1414,7 +1417,8 @@
   netBSD,
   LinuX,
   emx,
-  win32
+  win32,
+  dragonfly
 } System;
 
 #   ifdef linux
@@ -1427,6 +1431,8 @@
 System sys = emx;
 #   elif defined WIN32
 System sys = win32;
+#   elif defined __DragonFly__
+System sys = dragonfly;
 #   else
 System sys = unknown;
 #   endif