diff --git a/configure.ac b/configure.ac
index 141fe4d43..b2481f540 100644
--- a/configure.ac
+++ b/configure.ac
@@ -775,6 +775,7 @@ hw/xfree86/common/Makefile
 hw/xfree86/common/xf86Build.h
 hw/xfree86/ddc/Makefile
 hw/xfree86/dixmods/Makefile
+hw/xfree86/dri/Makefile
 hw/xfree86/dummylib/Makefile
 hw/xfree86/fbdevhw/Makefile
 hw/xfree86/i2c/Makefile
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index fedf47542..e9d21762c 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = common ddc dummylib i2c x86emu int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
-	  xf8_32wid loader scanpci dixmods
+	  xf8_32wid loader scanpci dixmods dri
 
 bin_PROGRAMS = Xorg
 
diff --git a/hw/xfree86/dri/Makefile.am b/hw/xfree86/dri/Makefile.am
new file mode 100644
index 000000000..cdc1c8bf1
--- /dev/null
+++ b/hw/xfree86/dri/Makefile.am
@@ -0,0 +1,13 @@
+libdri_la_LTLIBRARIES = libdri.la
+libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/GL/glx/ -I$(top_srcdir)/GL/include -DXF86DRI -DXORG_VERSION_CURRENT=\"100\"
+libdri_la_LDFLAGS = -module -avoid-version
+libdri_ladir = @moduledir@/extensions
+libdri_la_SOURCES = \
+	dri.c \
+	dri.h \
+	drimodule.c \
+	dristruct.h \
+	sarea.h \
+	xf86dri.c
+
+sdk_HEADERS = dri.h sarea.h dristruct.h  xf86dri.h
diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
index 38d9130e7..2b136f987 100644
--- a/hw/xfree86/i2c/Makefile.am
+++ b/hw/xfree86/i2c/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS)
 
-sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h
+sdk_HEADERS = xf86i2c.h bt829.h fi1236.h msp3430.h tda8425.h tda9850.h tda9885.h uda1380.h i2c_def.h