diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 457e46f1caf..89efdaf68b9 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2009/01/26 10:28:33 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2009/01/30 09:32:30 eric Exp $
 
 COMMENT=		vector graphics library
 
 DISTNAME=		cairo-1.8.6
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 SHARED_LIBS=		cairo   9.2
 CATEGORIES=		graphics
 
diff --git a/graphics/cairo/patches/patch-src_cairo-ft-font_c b/graphics/cairo/patches/patch-src_cairo-ft-font_c
new file mode 100644
index 00000000000..c853025b92d
--- /dev/null
+++ b/graphics/cairo/patches/patch-src_cairo-ft-font_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_cairo-ft-font_c,v 1.1 2009/01/30 09:32:30 eric Exp $
+--- src/cairo-ft-font.c.orig	Mon Jan 26 11:35:11 2009
++++ src/cairo-ft-font.c	Mon Jan 26 11:34:58 2009
+@@ -528,7 +528,7 @@ _has_unlocked_face (void *entry)
+ {
+     cairo_ft_unscaled_font_t *unscaled = entry;
+ 
+-    return (unscaled->lock_count == 0 && unscaled->face);
++    return (!unscaled->from_face && unscaled->lock_count == 0 && unscaled->face);
+ }
+ 
+ /* Ensures that an unscaled font has a face object. If we exceed