diff --git a/ChangeLog b/ChangeLog
index e4acef8d7..161c42506 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-09  Jürg Billeter  <j@bitron.ch>
+
+	* configure.ac: use RGB_DB not RGB_PATH as that's what it's looking for
+
+	* xkb/Makefile.am: define HAVE_XKB_CONFIG_H so setting xkb-path works
+
 2005-09-02  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* configure.ac: 
diff --git a/configure.ac b/configure.ac
index 136852447..91af62394 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,7 +447,7 @@ if test "x$USE_RGB_BUILTIN" = xyes; then
 fi
 
 AC_DEFINE_DIR(COMPILEDDEFAULTFONTPATH, FONTPATH, [Default font path])
-AC_DEFINE_DIR(RGB_PATH, RGBPATH, [Default RGB path])
+AC_DEFINE_DIR(RGB_DB, RGBPATH, [Default RGB path])
 AC_DEFINE_UNQUOTED(XVENDORNAME, ["$VENDOR_STRING"], [Vendor name])
 AC_DEFINE_UNQUOTED(XORG_RELEASE, ["$VENDOR_RELEASE"], [Vendor release])
 AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
diff --git a/xkb/Makefile.am b/xkb/Makefile.am
index 6ec34c97e..da92b5288 100644
--- a/xkb/Makefile.am
+++ b/xkb/Makefile.am
@@ -1,6 +1,7 @@
 noinst_LTLIBRARIES = libxkb.la libxkbstubs.la
 
-AM_CFLAGS = $(DIX_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) \
+	-DHAVE_XKB_CONFIG_H
 	
 DDX_SRCS = \
         ddxBeep.c \