diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 447c5995f..a9292fa55 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -856,13 +856,8 @@ ddxGiveUp(enum ExitCode error)
 void
 OsVendorFatalError(const char *f, va_list args)
 {
-#ifdef VENDORSUPPORT
-    ErrorFSigSafe("\nPlease refer to your Operating System Vendor support "
-                 "pages\nat %s for support on this crash.\n", VENDORSUPPORT);
-#else
     ErrorFSigSafe("\nPlease consult the " XVENDORNAME " support \n\t at "
                  __VENDORDWEBSUPPORT__ "\n for help. \n");
-#endif
     if (xf86LogFile && xf86LogFileWasOpened)
         ErrorFSigSafe("Please also check the log file at \"%s\" for additional "
                      "information.\n", xf86LogFile);
diff --git a/os/utils.c b/os/utils.c
index 1f42d5e06..c3d90ac8a 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -1405,9 +1405,7 @@ enum BadCode {
     InternalError
 };
 
-#if defined(VENDORSUPPORT)
-#define BUGADDRESS VENDORSUPPORT
-#elif defined(BUILDERADDR)
+#if defined(BUILDERADDR)
 #define BUGADDRESS BUILDERADDR
 #else
 #define BUGADDRESS "xorg@freedesktop.org"