diff --git a/configure.ac b/configure.ac
index f9c8408a5..a5bdfb40a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1649,11 +1649,10 @@ AC_MSG_CHECKING([whether to build Xprint DDX])
 AC_MSG_RESULT([$XPRINT])
 
 if test "x$XPRINT" = xyes; then
-	PKG_CHECK_MODULES([XPRINT], [printproto x11 xfont $XDMCP_MODULES xau])
-	XPRINT_EXTENSIONS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS"
-	XPRINT_LIBS="$DIX_LIB $XKB_LIB $XKB_STUB_LIB $XPRINT_EXTENSIONS $MIEXT_DAMAGE_LIB $CWRAP_LIB $XPRINT_LIBS"
-	AC_SUBST([XPRINT_CFLAGS])
-	AC_SUBST([XPRINT_LIBS])
+	PKG_CHECK_MODULES([XPRINTMODULES], [printproto x11 xfont $XDMCP_MODULES xau])
+	XPRINT_CFLAGS="$XPRINTMODULES_CFLAGS"
+	XPRINT_LIBS="$XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $RENDER_LIB $COMPOSITE_LIB $RANDR_LIB $XI_LIB $FIXES_LIB $DAMAGE_LIB $XI_LIB $GLX_LIBS $MIEXT_DAMAGE_LIB $CWRAP_LIBS $XKB_LIB $XKB_STUB_LIB"
+	XPRINT_SYS_LIBS="$XPRINTMODULES_LIBS"
 
 	xpconfigdir=$libdir/X11/xserver
 	AC_SUBST([xpconfigdir])
@@ -1689,10 +1688,13 @@ if test "x$XPRINT" = xyes; then
             FREETYPE_LIBS=""
             FREETYPE_REQUIRES=""
         fi
-        AC_SUBST(FREETYPE_LIBS)
-        AC_SUBST(FREETYPE_CFLAGS)
-        AC_SUBST(FREETYPE_REQUIRES)
+	XPRINT_CFLAGS="$XPRINT_CFLAGS $FREETYPE_CFLAGS"
+	XPRINT_SYS_LIBS="$XPRINT_SYS_LIBS $FREETYPE_LIBS"
 	# end freetype support
+
+	AC_SUBST([XPRINT_CFLAGS])
+	AC_SUBST([XPRINT_LIBS])
+	AC_SUBST([XPRINT_SYS_LIBS])
 fi
 AM_CONDITIONAL(XP_USE_FREETYPE, [test "x$XPRINT" = xyes && test "x$XP_USE_FREETYPE" = xyes])
 
diff --git a/hw/xprint/Makefile.am b/hw/xprint/Makefile.am
index dc8764a02..c440473a0 100644
--- a/hw/xprint/Makefile.am
+++ b/hw/xprint/Makefile.am
@@ -9,10 +9,22 @@ Xprt_CFLAGS = @DIX_CFLAGS@ @XPRINT_CFLAGS@ \
 	-DXFree86Server
 
 Xprt_LDFLAGS = -L$(top_srcdir)
-Xprt_LDADD = @XPRINT_LIBS@ ps/libps.la raster/libraster.la  \
-	pcl/libpcl.la pcl-mono/libpcl.la $(top_builddir)/fb/libfb.la \
-	$(top_builddir)/render/librender.la $(top_builddir)/mi/libmi.la \
-	$(top_builddir)/Xext/libXext.la  @FREETYPE_LIBS@
+XPRINT_LIBS = \
+	@XPRINT_LIBS@ \
+	ps/libps.la \
+	raster/libraster.la \
+	pcl/libpcl.la \
+	pcl-mono/libpcl.la \
+	$(top_builddir)/fb/libfb.la \
+	$(top_builddir)/render/librender.la \
+	$(XSERVER_LIBS) \
+	$(top_builddir)/Xext/libXext.la \
+	$(top_builddir)/xkb/libxkb.la \
+	$(top_builddir)/xkb/libxkbstubs.la \
+	$(top_builddir)/os/libos.la # for Xprintf
+
+Xprt_DEPENDENCIES = $(XPRINT_LIBS)
+Xprt_LDADD = $(XPRINT_LIBS) $(XPRINT_SYS_LIBS) $(XSERVER_SYS_LIBS)
 
 miinitext-wrapper.c:
 	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@