diff -rupN xorg-server-1.17.4.old/glamor/Makefile.am xorg-server-1.17.4/glamor/Makefile.am
--- xorg-server-1.17.4.old/glamor/Makefile.am	2015-10-27 21:12:00.000000000 +0100
+++ xorg-server-1.17.4/glamor/Makefile.am	2015-11-23 16:16:23.773854319 +0100
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libglamor.la libglamor_egl_stubs.la
 
-libglamor_la_LIBADD = $(GLAMOR_LIBS)
+libglamor_la_LIBADD = $(GLAMOR_LIBS) $(top_builddir)/fb/libfb.la
 
 AM_CFLAGS = $(CWARNFLAGS) $(DIX_CFLAGS) $(GLAMOR_CFLAGS)
 
diff -rupN xorg-server-1.17.4.old/glamor/Makefile.in xorg-server-1.17.4/glamor/Makefile.in
--- xorg-server-1.17.4.old/glamor/Makefile.in	2015-10-28 17:31:38.000000000 +0100
+++ xorg-server-1.17.4/glamor/Makefile.in	2015-11-23 16:16:41.027310899 +0100
@@ -571,7 +571,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 noinst_LTLIBRARIES = libglamor.la libglamor_egl_stubs.la
-libglamor_la_LIBADD = $(GLAMOR_LIBS)
+libglamor_la_LIBADD = $(GLAMOR_LIBS) $(top_builddir)/fb/libfb.la
 AM_CFLAGS = $(CWARNFLAGS) $(DIX_CFLAGS) $(GLAMOR_CFLAGS)
 libglamor_la_SOURCES = \
 	glamor.c \