diff --git a/winsup/doc/ChangeLog b/winsup/doc/ChangeLog
index 62a40c23c..15aba7884 100644
--- a/winsup/doc/ChangeLog
+++ b/winsup/doc/ChangeLog
@@ -1,3 +1,11 @@
+2013-07-20  Warren Young  <warren@etr-usa.com>
+	    Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in (cygwin-ug-net/cygwin-ug-net.pdf): Process input via
+	xsltproc and fop.
+	(cygwin-api/cygwin-api.pdf): Ditto.
+	* fo.xsl: New file.
+
 2013-07-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* new-features.sgml (ov-new1.7.22): New section.  Document dropped
diff --git a/winsup/doc/Makefile.in b/winsup/doc/Makefile.in
index 48bf50472..a13a59093 100644
--- a/winsup/doc/Makefile.in
+++ b/winsup/doc/Makefile.in
@@ -47,7 +47,7 @@ clean:
 	rm -f *.html *.html.gz
 	rm -Rf cygwin-api cygwin-ug cygwin-ug-net faq
 
-install:	all
+install: all
 
 cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : cygwin-ug-net.xml
 	-${XMLTO} html-nochunks -m $(srcdir)/cygwin.xsl $<
@@ -58,15 +58,14 @@ cygwin-ug-net/cygwin-ug-net-nochunks.html.gz : cygwin-ug-net.xml
 cygwin-ug-net/cygwin-ug-net.html : cygwin-ug-net.xml
 	-${XMLTO} html -o cygwin-ug-net/ -m $(srcdir)/cygwin.xsl $<
 
-# Some versions of jw hang with the -o option
 cygwin-ug-net/cygwin-ug-net.pdf : cygwin-ug-net.xml
-	-${XMLTO} pdf -o cygwin-ug-net/ $<
+	-xsltproc --xinclude $(srcdir)/fo.xsl $< | fop -q -fo - $@
 
 cygwin-api/cygwin-api.html : cygwin-api.xml
 	-${XMLTO} html -o cygwin-api/ -m $(srcdir)/cygwin.xsl $<
 
 cygwin-api/cygwin-api.pdf : cygwin-api.xml
-	-${XMLTO} pdf -o cygwin-api/ $<
+	-xsltproc --xinclude $(srcdir)/fo.xsl $< | fop -q -fo - $@
 
 cygwin-api.xml : cygwin-api.in.xml ./doctool Makefile
 	-./doctool -m $(DBXDIRS) -s $(srcdir) -o $@ $<
diff --git a/winsup/doc/fo.xsl b/winsup/doc/fo.xsl
new file mode 100644
index 000000000..4bc255ce8
--- /dev/null
+++ b/winsup/doc/fo.xsl
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet
+		xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+		xmlns:fo="http://www.w3.org/1999/XSL/Format"
+		version="1.0">
+	
+	<!-- Import the standard DocBook stylesheet that this one is based on.
+	     We use a web URL, but the local XML catalog should resolve this to
+			 the local copy of the stylesheet, if it exists. -->
+	<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
+
+	<!-- Add page breaks before each sect1 -->
+	<xsl:attribute-set name="section.level1.properties">
+		<xsl:attribute name="break-before">page</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Rag-right lines -->
+	<xsl:attribute-set name="root.properties">
+		<xsl:attribute name="text-align">left</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Use a smaller font for code listings to increase the chances
+	     that they can fit on a single sheet, to reduce FOP complaints
+			 about being forced to split a listing across pages. -->
+	<xsl:attribute-set name="monospace.verbatim.properties">
+		<xsl:attribute name="font-size">85%</xsl:attribute>
+	</xsl:attribute-set>
+
+	<!-- Inform the DocBook stylesheets that it's safe to use FOP
+	     specific extensions. -->
+	<xsl:param name="fop1.extensions" select="1"/>
+</xsl:stylesheet>