--- src/Makefile.in.orig	2013-08-23 11:06:43.054562100 -0400
+++ src/Makefile.in	2013-08-23 11:08:24.730632600 -0400
@@ -452,7 +452,7 @@
 intel_drv_ladir = @moduledir@/drivers
 intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ \
 	$(XORG_LIBS) $(am__append_2) $(am__append_4)
-NULL := #
+#NULL := #
 intel_drv_la_SOURCES = \
 	i915_pciids.h \
 	intel_list.h \
--- src/Makefile.am.orig	2013-08-23 11:18:06.321488900 -0400
+++ src/Makefile.am	2013-08-23 11:21:41.552363500 -0400
@@ -38,6 +38,9 @@
 intel_drv_la_LDFLAGS = -module -avoid-version
 intel_drv_ladir = @moduledir@/drivers
 intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(XORG_LIBS)
+intel_drv_la_LDFLAGS += -R $(moduledir) -R $(moduledir)/extensions
+intel_drv_la_LIBADD += -lfb -lshadowfb -lXfont -lm \
+       -lvbe -lvgahw -lexa -lglx $(XORG_LIBS)
 
 if SNA
 SUBDIRS += sna
@@ -49,7 +52,7 @@
 intel_drv_la_LIBADD += uxa/libuxa.la
 endif
 
-NULL:=#
+#NULL:=#
 
 intel_drv_la_SOURCES = \
 	i915_pciids.h \
--- src/legacy/Makefile.in.orig	2013-08-23 11:17:58.591581900 -0400
+++ src/legacy/Makefile.in	2013-08-23 11:19:23.468393900 -0400
@@ -381,7 +381,7 @@
 top_srcdir = @top_srcdir@
 SUBDIRS = $(am__append_1)
 noinst_LTLIBRARIES = liblegacy.la
-NULL := #
+#NULL := #
 liblegacy_la_SOURCES = legacy.h $(am__append_2)
 liblegacy_la_LIBADD = $(am__append_3)
 EXTRA_DIST = README
--- src/legacy/Makefile.am.orig	2013-08-23 11:31:10.576901200 -0400
+++ src/legacy/Makefile.am	2013-08-23 11:35:46.935119400 -0400
@@ -1,10 +1,21 @@
 SUBDIRS =
 noinst_LTLIBRARIES = liblegacy.la
 
-NULL:=#
+#NULL:=#
 
-liblegacy_la_SOURCES = legacy.h
-liblegacy_la_LIBADD =
+liblegacy_la_SOURCES = legacy.h \
+                      i810/i810_accel.c \
+                      i810/i810_cursor.c \
+                      i810/i810_dga.c \
+                      i810/i810_dri.c \
+                      i810/i810_driver.c \
+                      i810/i810_hwmc.c \
+                      i810/i810_memory.c \
+                      i810/i810_video.c \
+                      i810/i810_wmark.c
+
+AM_CFLAGS = @XORG_CFLAGS@ @DRM_CFLAGS@ @DRI_CFLAGS@ -I $(top_srcdir)/src
+liblegacy_la_LIBADD = @DRI_LIBS@ @DRM_LIBS@ @XVMCLIB_LIBS@
 
 if ! KMS_ONLY
 SUBDIRS += i810