Index: xf86Init.c
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/common/xf86Init.c,v
retrieving revision 1.15
diff -u -r1.15 xf86Init.c
--- xf86Init.c	24 Nov 2004 02:45:33 -0000	1.15
+++ xf86Init.c	16 Dec 2004 15:25:49 -0000
@@ -1747,8 +1747,22 @@
 #endif
 
 #if XORG_VERSION_SNAP >= 900
-  ErrorF(" (%d.%d.0 RC %d)", XORG_VERSION_MAJOR, XORG_VERSION_MINOR + 1,
-				XORG_VERSION_SNAP - 900);
+  /* When the patch number is 99, that signifies that the we are making
+   * a release candidate for a major version; however, if the patch
+   * number is < 99, then we are making a release candidate for the next
+   * point release.
+   */
+  if (XORG_VERSION_PATCH == 99)
+      ErrorF(" (%d.%d.0 RC %d)",
+	     XORG_VERSION_MAJOR,
+	     XORG_VERSION_MINOR + 1,
+	     XORG_VERSION_SNAP - 900);
+  else
+      ErrorF(" (%d.%d.%d RC %d)",
+	     XORG_VERSION_MAJOR,
+	     XORG_VERSION_MINOR,
+	     XORG_VERSION_PATCH + 1,
+	     XORG_VERSION_SNAP - 900);
 #endif
 
 #ifdef XORG_CUSTOM_VERSION