diff --git a/configure.ac b/configure.ac
index 0aa3dba5fc..764165ea6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -105,6 +105,11 @@ if test -f 'doc/xml/UserGuide/Makefile.in' ; then
 else
    USERGUIDE_MAKEFILE=
 fi
+if test -f 'doc/xml/mobi-fixup.xsl.in' ; then
+   MOBI_FIXUP_XSL="doc/xml/mobi-fixup.xsl"
+else
+   MOBI_FIXUP_XSL=
+fi
 
 AC_OUTPUT(             \
 Makefile               \
@@ -112,6 +117,7 @@ ${MAN_MAKEFILE} \
 ${ADMINGUIDE_MAKEFILE} \
 ${QSUNIX_MAKEFILE} \
 ${USERGUIDE_MAKEFILE} \
+${MOBI_FIXUP_XSL} \
 src/afs/Makefile \
 src/afsd/Makefile \
 src/afsmonitor/Makefile \
diff --git a/doc/xml/AdminGuide/Makefile.in b/doc/xml/AdminGuide/Makefile.in
index cbbba59a9f..33d0dc86b8 100644
--- a/doc/xml/AdminGuide/Makefile.in
+++ b/doc/xml/AdminGuide/Makefile.in
@@ -15,7 +15,7 @@
 
 BOOK = auagd000
 
-all: $(BOOK).pdf index.html
+all: $(BOOK).pdf index.html $(BOOK).epub $(BOOK).mobi
 
 include @TOP_OBJDIR@/src/config/Makefile.config
 VERSION=version
@@ -30,6 +30,7 @@ HTML_XSL = @HTML_XSL@
 DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
+DBTOEPUB = $(DOCBOOK_STYLESHEETS)/epub/bin/dbtoepub
 
 index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
@@ -43,6 +44,14 @@ $(BOOK).pdf: $(SRCS)
 		$(DOCBOOK2PDF) $(BOOK).xml; \
 	fi
 
+$(BOOK).epub: $(SRCS)
+	if test -x "$(DBTOEPUB)" ; then \
+		$(DBTOEPUB) -s $(TOP_SRCDIR)/../doc/xml/mobi-fixup.xsl $(BOOK).xml; \
+	fi
+
+$(BOOK).mobi: $(BOOK).epub
+	kindlegen $(BOOK).epub -o $(BOOK).mobi
+
 check:
 	xmllint --noout --valid $(BOOK).xml
 
diff --git a/doc/xml/AdminGuide/auagd000.png b/doc/xml/AdminGuide/auagd000.png
new file mode 100644
index 0000000000..344ab25e3f
Binary files /dev/null and b/doc/xml/AdminGuide/auagd000.png differ
diff --git a/doc/xml/AdminGuide/auagd000.xml b/doc/xml/AdminGuide/auagd000.xml
index 92c1441e28..5946bb0c6e 100644
--- a/doc/xml/AdminGuide/auagd000.xml
+++ b/doc/xml/AdminGuide/auagd000.xml
@@ -28,6 +28,12 @@
   <bookinfo>
     <title>OpenAFS Administration Guide</title>
 
+    <mediaobject role="cover">
+      <imageobject>
+        <imagedata fileref="auagd000.png" />
+      </imageobject>
+    </mediaobject>
+
     <copyright>
       <year>2000</year>
 
diff --git a/doc/xml/QuickStartUnix/Makefile.in b/doc/xml/QuickStartUnix/Makefile.in
index 229e2642c4..73516453f5 100644
--- a/doc/xml/QuickStartUnix/Makefile.in
+++ b/doc/xml/QuickStartUnix/Makefile.in
@@ -15,7 +15,7 @@
 
 BOOK = auqbg000
 
-all: $(BOOK).pdf index.html
+all: $(BOOK).pdf index.html $(BOOK).epub $(BOOK).mobi
 
 include @TOP_OBJDIR@/src/config/Makefile.config
 VERSION=version
@@ -28,6 +28,7 @@ HTML_XSL = @HTML_XSL@
 DOCBOOK_STYLESHEETS = @DOCBOOK_STYLESHEETS@
 XSLTPROC = @XSLTPROC@
 DOCBOOK2PDF = @DOCBOOK2PDF@
+DBTOEPUB = $(DOCBOOK_STYLESHEETS)/epub/bin/dbtoepub
 
 index.html: $(SRCS)
 	$(XSLTPROC) --param navig.graphics 1 \
@@ -41,6 +42,14 @@ $(BOOK).pdf: $(SRCS)
 		$(DOCBOOK2PDF) $(BOOK).xml; \
 	fi
 
+$(BOOK).epub: $(SRCS)
+	if test -x "$(DBTOEPUB)" ; then \
+		$(DBTOEPUB) -s $(TOP_SRCDIR)/../doc/xml/mobi-fixup.xsl $(BOOK).xml; \
+	fi
+
+$(BOOK).mobi: $(BOOK).epub
+	kindlegen $(BOOK).epub -o $(BOOK).mobi
+
 check:
 	xmllint --noout --valid $(BOOK).xml
 
diff --git a/doc/xml/QuickStartUnix/auqbg000.png b/doc/xml/QuickStartUnix/auqbg000.png
new file mode 100644
index 0000000000..941cd3e2c2
Binary files /dev/null and b/doc/xml/QuickStartUnix/auqbg000.png differ
diff --git a/doc/xml/QuickStartUnix/auqbg000.xml b/doc/xml/QuickStartUnix/auqbg000.xml
index a7993c22b4..13b376ed3b 100644
--- a/doc/xml/QuickStartUnix/auqbg000.xml
+++ b/doc/xml/QuickStartUnix/auqbg000.xml
@@ -16,6 +16,12 @@
   <bookinfo>
     <title>OpenAFS Quick Start Guide for UNIX</title>
 
+    <mediaobject role="cover">
+      <imageobject>
+        <imagedata fileref="auqbg000.png" />
+      </imageobject>
+    </mediaobject>
+
     <copyright>
       <year>2000-2009</year>
       <holder>IBM Corporation and other contributors. All Rights Reserved</holder>
diff --git a/doc/xml/UserGuide/Makefile.in b/doc/xml/UserGuide/Makefile.in
index 725959c981..4757ccd92b 100644
--- a/doc/xml/UserGuide/Makefile.in
+++ b/doc/xml/UserGuide/Makefile.in
@@ -15,7 +15,7 @@
 
 BOOK = auusg000
 
-all: $(BOOK).pdf index.html
+all: $(BOOK).pdf index.html $(BOOK).epub $(BOOK).mobi
 
 include @TOP_OBJDIR@/src/config/Makefile.config
 VERSION=version
@@ -41,6 +41,14 @@ $(BOOK).pdf: $(SRCS)
 		$(DOCBOOK2PDF) $(BOOK).xml; \
 	fi
 
+$(BOOK).epub: $(SRCS)
+	if test -x "$(DBTOEPUB)" ; then \
+		$(DBTOEPUB) -s $(TOP_SRCDIR)/../doc/xml/mobi-fixup.xsl $(BOOK).xml; \
+	fi
+
+$(BOOK).mobi: $(BOOK).epub
+	kindlegen $(BOOK).epub -o $(BOOK).mobi
+
 check:
 	xmllint --noout --valid $(BOOK).xml
 
diff --git a/doc/xml/UserGuide/auusg000.png b/doc/xml/UserGuide/auusg000.png
new file mode 100644
index 0000000000..c9b17cc71e
Binary files /dev/null and b/doc/xml/UserGuide/auusg000.png differ
diff --git a/doc/xml/UserGuide/auusg000.xml b/doc/xml/UserGuide/auusg000.xml
index cbd0fd8225..ffb965045b 100644
--- a/doc/xml/UserGuide/auusg000.xml
+++ b/doc/xml/UserGuide/auusg000.xml
@@ -18,6 +18,12 @@
   <bookinfo>
     <title>OpenAFS User Guide</title>
 
+    <mediaobject role="cover">
+      <imageobject>
+        <imagedata fileref="auusg000.png" />
+      </imageobject>
+    </mediaobject>
+
     <copyright>
       <year>2000</year>
 
diff --git a/doc/xml/mobi-fixup.xsl.in b/doc/xml/mobi-fixup.xsl.in
new file mode 100644
index 0000000000..8e33521483
--- /dev/null
+++ b/doc/xml/mobi-fixup.xsl.in
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+
+<!--
+     The kindle seems to render certain lists with an extra line break.
+     To work around this for now, we remove the first <para> for itemized
+     and ordered lists.
+-->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+    <xsl:import href="@DOCBOOK_STYLESHEETS@/epub/docbook.xsl"/>
+
+    <xsl:template match="/">
+	<xsl:copy>
+	    <xsl:apply-imports/>
+	</xsl:copy>
+    </xsl:template>
+
+
+    <xsl:template match="itemizedlist/listitem/para[position() = 1]">
+        <!-- still process any anchors embedded in the <listitem> -->
+        <xsl:call-template name="anchor">
+            <xsl:with-param name="node" select="parent::listitem"/>
+        </xsl:call-template>
+	<xsl:apply-templates/>
+    </xsl:template>
+
+    <xsl:template match="orderedlist/listitem/para[position() = 1]">
+        <!-- still process any anchors embedded in the <listitem> -->
+        <xsl:call-template name="anchor">
+            <xsl:with-param name="node" select="parent::listitem"/>
+        </xsl:call-template>
+	<xsl:apply-templates/>
+    </xsl:template>
+
+</xsl:stylesheet>