diff --git a/ChangeLog b/ChangeLog
index 1e3099f51..406d9d1d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-19  Owen Taylor  <otaylor@redhat.com>
+
+	* src/cairo-pdf-surface.c (_cairo_pdf_surface_show_glyphs):
+	Ignore really small fonts, since size zero fonts give xpdf
+	fits. (#2938)
+
 2005-08-19  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-font.c: (_cairo_scaled_font_set_error): Fix to
diff --git a/src/cairo-pdf-surface.c b/src/cairo-pdf-surface.c
index 204a0a3f7..cff965bb2 100644
--- a/src/cairo-pdf-surface.c
+++ b/src/cairo-pdf-surface.c
@@ -1306,6 +1306,7 @@ _cairo_pdf_surface_show_glyphs (cairo_scaled_font_t	*scaled_font,
     cairo_output_stream_t *output = document->output_stream;
     cairo_font_subset_t *pdf_font;
     int i, index;
+    double det;
 
     /* XXX: Need to fix this to work with a general cairo_scaled_font_t. */
     if (! _cairo_scaled_font_is_ft (scaled_font))
@@ -1315,6 +1316,13 @@ _cairo_pdf_surface_show_glyphs (cairo_scaled_font_t	*scaled_font,
     if (pdf_font == NULL)
 	return CAIRO_STATUS_NO_MEMORY;
 
+    /* Some PDF viewers (at least older versions of xpdf) have trouble with
+     * size 0 fonts. If the font size is less than 1/1000pt, ignore the
+     * font */
+    _cairo_matrix_compute_determinant (&scaled_font->scale, &det);
+    if (fabs (det) < 0.000001)
+	return CAIRO_STATUS_SUCCESS;
+    
     emit_pattern (surface, pattern);
 
     _cairo_output_stream_printf (output,