diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 27f2cc6cb..c45d8c9fb 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -59,7 +59,7 @@ LOCAL_LIBS = \
             loader/libloader.la \
             common/libcommon.la \
             os-support/libxorgos.la \
-            parser/libxf86config_internal.la \
+            parser/libxf86config.la \
             dixmods/libdixmods.la \
             modes/libxf86modes.la \
             ramdac/libramdac.la \
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 8e496bfb0..9aa8cfefb 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LTLIBRARIES = libxf86config_internal.la
+noinst_LTLIBRARIES = libxf86config.la
 
 INTERNAL_SOURCES= \
 	Device.c \
@@ -20,7 +20,7 @@ INTERNAL_SOURCES= \
 	DRI.c \
 	Extensions.c
 
-libxf86config_internal_la_SOURCES = \
+libxf86config_la_SOURCES = \
 	$(INTERNAL_SOURCES)
 
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \
diff --git a/test/Makefile.am b/test/Makefile.am
index 82578d977..4d935a268 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -49,7 +49,7 @@ libxservertest_la_LIBADD += \
             $(top_builddir)/hw/xfree86/loader/libloader.la \
             $(top_builddir)/hw/xfree86/os-support/libxorgos.la \
             $(top_builddir)/hw/xfree86/common/libcommon.la \
-            $(top_builddir)/hw/xfree86/parser/libxf86config_internal.la \
+            $(top_builddir)/hw/xfree86/parser/libxf86config.la \
             $(top_builddir)/hw/xfree86/dixmods/libdixmods.la \
             $(top_builddir)/hw/xfree86/modes/libxf86modes.la \
             $(top_builddir)/hw/xfree86/ramdac/libramdac.la \