diff --git a/x11/kde/office3/Makefile b/x11/kde/office3/Makefile
index 956bbcb1175..a62faca8433 100644
--- a/x11/kde/office3/Makefile
+++ b/x11/kde/office3/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.46 2007/06/09 23:10:45 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2007/08/03 00:37:55 kili Exp $
 
-COMMENT=		"office suite for KDE"
+COMMENT=		office suite for KDE
 
 VERSION=		1.6.3
 CATEGORIES=		x11 x11/kde productivity
@@ -8,7 +8,10 @@ VMEM_WARNING=		Yes
 MASTER_SITES?=		${MASTER_SITE_KDE:S@$@stable/koffice-${VERSION}/src/@}
 
 DISTNAME=	koffice-${VERSION}
-PKGNAME=	${DISTNAME}
+PKGNAME=	${DISTNAME}p0
+
+MASTER_SITES0=		ftp://ftp.kde.org/pub/kde/security_patches/
+PATCHFILES=		koffice-xpdf-CVE-2007-3387.diff:0
 
 SHARED_LIBS +=	kstore               3.0      # .3.0
 SHARED_LIBS +=	kwmf                 3.0      # .3.0
@@ -81,6 +84,7 @@ LIB_DEPENDS=	kdecore.>=4,DCOP,artskde,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kpart
 		mysqlclient::databases/mysql \
 		ruby::lang/ruby \
 		exif.>=12::graphics/libexif \
+		paper::print/libpaper \
 		poppler-qt::print/poppler,-qt \
 		GraphicsMagick::graphics/GraphicsMagick \
 		wpd::textproc/libwpd
diff --git a/x11/kde/office3/distinfo b/x11/kde/office3/distinfo
index 04a564359ad..45dbffb0495 100644
--- a/x11/kde/office3/distinfo
+++ b/x11/kde/office3/distinfo
@@ -1,5 +1,10 @@
 MD5 (kde/koffice-1.6.3.tar.bz2) = OG04gJRzT5dZl3wyZwmOMA==
+MD5 (kde/koffice-xpdf-CVE-2007-3387.diff) = 615lzV+tqxKMG8XOIhESaw==
 RMD160 (kde/koffice-1.6.3.tar.bz2) = 5HS6SPqYP6+2GtWPt5zd2mnsaQg=
+RMD160 (kde/koffice-xpdf-CVE-2007-3387.diff) = f2IOwAygXakVlvLXUNMu2KqL7JU=
 SHA1 (kde/koffice-1.6.3.tar.bz2) = 3oQhTeyRPqwdR9qwTdk/PYFyn9M=
+SHA1 (kde/koffice-xpdf-CVE-2007-3387.diff) = v/T1QDiadzILyH4t7ezlC4KTLlk=
 SHA256 (kde/koffice-1.6.3.tar.bz2) = w5dfCln1CqpVR/Fwm2+tVPdG/QaBWFmzdGdrQm3OEss=
+SHA256 (kde/koffice-xpdf-CVE-2007-3387.diff) = j031EzRS26FGnsYFOTUD0rIz16rMu+4OXkK3nCS+kGI=
 SIZE (kde/koffice-1.6.3.tar.bz2) = 56829391
+SIZE (kde/koffice-xpdf-CVE-2007-3387.diff) = 601