diff --git a/src/ErrDes.c b/src/ErrDes.c
index f6853f76..0905efad 100644
--- a/src/ErrDes.c
+++ b/src/ErrDes.c
@@ -1,6 +1,6 @@
 /*
  * $Xorg: ErrDes.c,v 1.4 2001/02/09 02:03:32 xorgcvs Exp $
- * $XdotOrg: lib/X11/src/ErrDes.c,v 1.7 2005-07-03 07:00:55 daniels Exp $
+ * $XdotOrg: lib/X11/src/ErrDes.c,v 1.8 2005-08-26 05:16:46 daniels Exp $
  */
 
 /***********************************************************
@@ -60,7 +60,11 @@ SOFTWARE.
 #include <stdio.h>
 
 #ifndef ERRORDB
+#ifndef XERRORDB
 #define ERRORDB "/usr/lib/X11/XErrorDB"
+#else
+#define ERRORDB XERRORDB
+#endif
 #endif
 
 /*
diff --git a/src/StrKeysym.c b/src/StrKeysym.c
index b6874d37..74ccecbc 100644
--- a/src/StrKeysym.c
+++ b/src/StrKeysym.c
@@ -39,7 +39,11 @@ in this Software without prior written authorization from The Open Group.
 #include "Key.h"
 
 #ifndef KEYSYMDB
+#ifndef XKEYSYMDB
 #define KEYSYMDB "/usr/lib/X11/XKeysymDB"
+#else
+#define KEYSYMDB XKEYSYMDB
+#endif
 #endif
 
 static Bool initialized;