diff --git a/ChangeLog b/ChangeLog
index fdbbed0..d82834c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-18  Jeroen Ruigrok van der Werven  <asmodai@dragonflybsd.org>
+
+	* config.guess (*:DRAGONFLY:*:*): New.
+	* config.sub (-dragonfly*): Likewise.
+
 2003-11-03  Ben Elliston  <bje@wasabisystems.com>
 
 	* config.guess: Detect OpenBSD on Pegasos I hardware.
diff --git a/config.guess b/config.guess
index 193e328..4c5bde8 100755
--- a/config.guess
+++ b/config.guess
@@ -1227,6 +1227,9 @@ EOF
     SEI:*:*:SEIUX)
         echo mips-sei-seiux${UNAME_RELEASE}
 	exit 0 ;;
+    *:DRAGONFLY:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly${UNAME_RELEASE}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff --git a/config.sub b/config.sub
index e1e455b..5698174 100755
--- a/config.sub
+++ b/config.sub
@@ -1152,7 +1152,7 @@ case $os in
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)