diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 898c9b846..b97ebd79f 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -53,7 +53,7 @@ libxorg_la_LIBADD = \
             loader/libloader.la \
             os-support/libxorgos.la \
             common/libcommon.la \
-            parser/libxf86config.la \
+            parser/libxf86config_internal.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 c0622090c..6153747e0 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -1,13 +1,14 @@
 if INSTALL_LIBXF86CONFIG
-lib_LTLIBRARIES = libxf86config.la
+lib_LTLIBRARIES = libxf86config_internal.la
+lib_LIBRARIES = libxf86config.a
 LIBHEADERS = \
 	xf86Optrec.h \
 	xf86Parser.h
 else
-noinst_LTLIBRARIES = libxf86config.la
+noinst_LTLIBRARIES = libxf86config_internal.la
 endif
 
-libxf86config_la_SOURCES = \
+INTERNAL_SOURCES= \
 	Device.c \
 	Files.c \
 	Flags.c \
@@ -25,6 +26,13 @@ libxf86config_la_SOURCES = \
 	DRI.c \
 	Extensions.c
 
+libxf86config_internal_la_SOURCES = \
+	$(INTERNAL_SOURCES)
+
+libxf86config_a_SOURCES = \
+	$(INTERNAL_SOURCES)
+libxf86config_a_CFLAGS = $(AM_CFLAGS)
+
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
 
 EXTRA_DIST = \