diff --git a/dix/dispatch.c b/dix/dispatch.c
index ce84e6c8c..bc44215b4 100644
--- a/dix/dispatch.c
+++ b/dix/dispatch.c
@@ -536,7 +536,6 @@ Dispatch(void)
 }
 
 static int VendorRelease = VENDOR_RELEASE;
-static const char *VendorString = VENDOR_NAME;
 
 void
 SetVendorRelease(int release)
@@ -544,12 +543,6 @@ SetVendorRelease(int release)
     VendorRelease = release;
 }
 
-void
-SetVendorString(const char *vendor)
-{
-    VendorString = vendor;
-}
-
 Bool
 CreateConnectionBlock(void)
 {
@@ -561,6 +554,7 @@ CreateConnectionBlock(void)
     unsigned long vid;
     int i, j, k, lenofblock, sizesofar = 0;
     char *pBuf;
+    const char VendorString[] = VENDOR_NAME;
 
     memset(&setup, 0, sizeof(xConnSetup));
     /* Leave off the ridBase and ridMask, these must be sent with
diff --git a/include/dix.h b/include/dix.h
index 146679b58..017be8a49 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -304,9 +304,6 @@ InitAtoms(void);
 extern _X_EXPORT void
 SetVendorRelease(int release);
 
-extern _X_EXPORT void
-SetVendorString(const char *string);
-
 int
 dix_main(int argc, char *argv[], char *envp[]);