diff --git a/ChangeLog b/ChangeLog
index 0803b68a7..0a9435fb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-21  Owen Taylor  <otaylor@redhat.com>
+
+	* Call _cairo_gstate_ensure_font(). Don't reference
+	the returned font.
+
 2005-01-21  Owen Taylor  <otaylor@redhat.com>
 
 	* src/cairo_ft_font.c (_get_load_flags): Make dependence
diff --git a/src/cairo-gstate.c b/src/cairo-gstate.c
index d16b6585a..737ae20c0 100644
--- a/src/cairo-gstate.c
+++ b/src/cairo-gstate.c
@@ -2215,10 +2215,14 @@ _cairo_gstate_transform_font (cairo_gstate_t *gstate,
 
 
 cairo_status_t
-_cairo_gstate_current_font (cairo_gstate_t *gstate, 			    cairo_font_t **font)
+_cairo_gstate_current_font (cairo_gstate_t *gstate,
+ 			    cairo_font_t  **font)
 {
+    status = _cairo_gstate_ensure_font (gstate);
+    if (status)
+	return status;
+    
     *font = gstate->font;
-    cairo_font_reference (*font);
 
     return CAIRO_STATUS_SUCCESS;
 }
diff --git a/src/cairo_gstate.c b/src/cairo_gstate.c
index d16b6585a..737ae20c0 100644
--- a/src/cairo_gstate.c
+++ b/src/cairo_gstate.c
@@ -2215,10 +2215,14 @@ _cairo_gstate_transform_font (cairo_gstate_t *gstate,
 
 
 cairo_status_t
-_cairo_gstate_current_font (cairo_gstate_t *gstate, 			    cairo_font_t **font)
+_cairo_gstate_current_font (cairo_gstate_t *gstate,
+ 			    cairo_font_t  **font)
 {
+    status = _cairo_gstate_ensure_font (gstate);
+    if (status)
+	return status;
+    
     *font = gstate->font;
-    cairo_font_reference (*font);
 
     return CAIRO_STATUS_SUCCESS;
 }