diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index bd244dd9278..8f145eea5f9 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2008/11/13 20:22:13 landry Exp $
+# $OpenBSD: Makefile,v 1.20 2008/12/13 09:55:01 brad Exp $
 
 COMMENT=		vector graphics library
 
-DISTNAME=		cairo-1.8.2
-SHARED_LIBS=		cairo   9.0
+DISTNAME=		cairo-1.8.4
+SHARED_LIBS=		cairo   9.1
 CATEGORIES=		graphics
 
 HOMEPAGE=		http://cairographics.org/introduction
@@ -11,7 +11,7 @@ HOMEPAGE=		http://cairographics.org/introduction
 MAINTAINER=		Eric Faurot <eric@openbsd.org>
 
 WANTLIB=		X11 Xau Xdmcp Xrender expat fontconfig freetype m \
-			pixman-1.>=11.0 z
+			pixman-1.>=12.0 z
 
 # LGPLv2.1 / MPL 1.1
 PERMIT_PACKAGE_CDROM=	Yes
@@ -19,8 +19,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://cairographics.org/releases/ \
-			http://cairographics.org/snapshots/
+MASTER_SITES=		http://cairographics.org/releases/
 
 USE_X11=		Yes
 USE_LIBTOOL=		Yes
@@ -31,7 +30,9 @@ LIB_DEPENDS=		png::graphics/png \
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ENV=		png_REQUIRES=libpng
-CONFIGURE_ARGS=		--enable-glitz
+CONFIGURE_ARGS=		--enable-glitz \
+			--enable-pdf \
+			--enable-ps
 
 REGRESS_DEPENDS=	:ghostscript-*:print/ghostscript/gnu
 
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 87cf8f61ebf..d05efb66bcd 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,5 +1,5 @@
-MD5 (cairo-1.8.2.tar.gz) = RNQG4ZnDOMtg99sy/7Mr2w==
-RMD160 (cairo-1.8.2.tar.gz) = YCAIhgvzVnLPSMfI+eGmtacC9qo=
-SHA1 (cairo-1.8.2.tar.gz) = QelNlOfzeVUfVW3XGXmsojmmiMY=
-SHA256 (cairo-1.8.2.tar.gz) = dGaVi4TClULEDCH/P4n6FzrqpE7FYkUa0YOmP3G3PnY=
-SIZE (cairo-1.8.2.tar.gz) = 7147742
+MD5 (cairo-1.8.4.tar.gz) = pQZ+NV54KU2ySFqpev0RFQ==
+RMD160 (cairo-1.8.4.tar.gz) = FuDGoDQsmCGSEtrB/5VsLLg5tOU=
+SHA1 (cairo-1.8.4.tar.gz) = V/0sfgrxa+581TQ218ncUmeE8do=
+SHA256 (cairo-1.8.4.tar.gz) = oTZO+LHXK4qTfo4FWSJP5HyaZkE3OgRUmobU3R5Tc5g=
+SIZE (cairo-1.8.4.tar.gz) = 7070822