diff --git a/Xi/Makefile.am b/Xi/Makefile.am
index 224377e2f..fbe438543 100644
--- a/Xi/Makefile.am
+++ b/Xi/Makefile.am
@@ -70,10 +70,11 @@ libXi_la_SOURCES =	\
 	setmmap.h \
 	setmode.c \
 	setmode.h \
-	stubs.c \
 	ungrdev.c \
 	ungrdev.h \
 	ungrdevb.c \
 	ungrdevb.h \
 	ungrdevk.c \
 	ungrdevk.h
+
+EXTRA_DIST = stubs.c
diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am
index 41564953e..2ea5309fd 100644
--- a/hw/vfb/Makefile.am
+++ b/hw/vfb/Makefile.am
@@ -3,6 +3,7 @@ bin_PROGRAMS = Xvfb
 SRCS =	InitInput.c \
 	InitOutput.c \
 	$(top_srcdir)/Xext/dpmsstubs.c \
+	$(top_srcdir)/Xi/stubs.c \
 	$(top_srcdir)/mi/miinitext.c \
 	$(top_srcdir)/fb/fbcmap.c