diff --git a/CHANGES b/CHANGES
index d9f9454a46..079e73a191 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+ 861.	[port]		Add support for Mac OS X, by making it equivalent
+ 			to Darwin.  This was derived from the config.guess
+			file shipped with Mac OS X. [RT #1355]
+
  860.	[func]		Drop cross class glue in zone transfers.
 
  859.	[bug]		Cache cleaning now won't swamp the CPU if there
diff --git a/config.guess b/config.guess
index ba66165161..5b19af8278 100644
--- a/config.guess
+++ b/config.guess
@@ -1114,7 +1114,7 @@ EOF
     *:Rhapsody:*:*)
 	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
 	exit 0 ;;
-    *:Darwin:*:*)
+    *:Darwin:*:* | *:"Mac OS":*:*)
 	echo `uname -p`-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
     *:procnto*:*:* | *:QNX:[0123456789]*:*)